Update safe-parcel

microg · Mar 14, 2015 · c0c4a78 · c0c4a78
1 parent dbae4ad
commit c0c4a78
Show file tree

Hide file tree

Showing 166 changed files with 9 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "SafeParcel"]
-	path = SafeParcel
+	path = extern/SafeParcel
 	url = https://github.com/microg/android_external_SafeParcel.git
diff --git a/Android.mk b/Android.mk
@@ -3,8 +3,8 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := GmsApi
-LOCAL_SRC_FILES := $(call all-java-files-under, src/main/java)
-LOCAL_SRC_FILES := $(call all-Iaidl-files-under, src/main/aidl)
+LOCAL_SRC_FILES := $(call all-java-files-under, play-services-api/src/main/java)
+LOCAL_SRC_FILES := $(call all-Iaidl-files-under, play-services-api/src/main/aidl)
 LOCAL_STATIC_JAVA_LIBRARIES := SafeParcel
 
 include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/SafeParcel b/SafeParcel
diff --git a/extern/SafeParcel b/extern/SafeParcel
diff --git a/build.gradle → play-services-api/build.gradle b/build.gradle → play-services-api/build.gradle
@@ -11,11 +11,11 @@ buildscript {
 apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
-group = 'org.microg.gms'
+group = 'org.microg'
 version = '1.0-SNAPSHOT'
 
 dependencies {
-    compile project(':SafeParcel')
+    compile project(':safe-parcel')
 }
 
 android {

diff --git a/src/main/AndroidManifest.xml → ...services-api/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml → ...services-api/src/main/AndroidManifest.xml
diff --git a/...gle/android/auth/IAuthManagerService.aidl → ...gle/android/auth/IAuthManagerService.aidl b/...gle/android/auth/IAuthManagerService.aidl → ...gle/android/auth/IAuthManagerService.aidl
diff --git a/...droid/gms/appdatasearch/CorpusStatus.aidl → ...droid/gms/appdatasearch/CorpusStatus.aidl b/...droid/gms/appdatasearch/CorpusStatus.aidl → ...droid/gms/appdatasearch/CorpusStatus.aidl
diff --git a/...s/appdatasearch/SuggestSpecification.aidl → ...s/appdatasearch/SuggestSpecification.aidl b/...s/appdatasearch/SuggestSpecification.aidl → ...s/appdatasearch/SuggestSpecification.aidl
diff --git a/.../gms/appdatasearch/SuggestionResults.aidl → .../gms/appdatasearch/SuggestionResults.aidl b/.../gms/appdatasearch/SuggestionResults.aidl → .../gms/appdatasearch/SuggestionResults.aidl
diff --git a/.../android/gms/appdatasearch/UsageInfo.aidl → .../android/gms/appdatasearch/UsageInfo.aidl b/.../android/gms/appdatasearch/UsageInfo.aidl → .../android/gms/appdatasearch/UsageInfo.aidl
diff --git a/...ppdatasearch/internal/IAppDataSearch.aidl → ...ppdatasearch/internal/IAppDataSearch.aidl b/...ppdatasearch/internal/IAppDataSearch.aidl → ...ppdatasearch/internal/IAppDataSearch.aidl
diff --git a/...h/internal/ILightweightAppDataSearch.aidl → ...h/internal/ILightweightAppDataSearch.aidl b/...h/internal/ILightweightAppDataSearch.aidl → ...h/internal/ILightweightAppDataSearch.aidl
diff --git a/...l/ILightweightAppDataSearchCallbacks.aidl → ...l/ILightweightAppDataSearchCallbacks.aidl b/...l/ILightweightAppDataSearchCallbacks.aidl → ...l/ILightweightAppDataSearchCallbacks.aidl
diff --git a/.../gms/auth/AccountChangeEventsRequest.aidl → .../gms/auth/AccountChangeEventsRequest.aidl b/.../gms/auth/AccountChangeEventsRequest.aidl → .../gms/auth/AccountChangeEventsRequest.aidl
diff --git a/...gms/auth/AccountChangeEventsResponse.aidl → ...gms/auth/AccountChangeEventsResponse.aidl b/...gms/auth/AccountChangeEventsResponse.aidl → ...gms/auth/AccountChangeEventsResponse.aidl
diff --git a/...e/android/gms/common/data/DataHolder.aidl → ...e/android/gms/common/data/DataHolder.aidl b/...e/android/gms/common/data/DataHolder.aidl → ...e/android/gms/common/data/DataHolder.aidl
diff --git a/...oid/gms/common/internal/ICancelToken.aidl → ...oid/gms/common/internal/ICancelToken.aidl b/...oid/gms/common/internal/ICancelToken.aidl → ...oid/gms/common/internal/ICancelToken.aidl
diff --git a/...id/gms/common/internal/IGmsCallbacks.aidl → ...id/gms/common/internal/IGmsCallbacks.aidl b/...id/gms/common/internal/IGmsCallbacks.aidl → ...id/gms/common/internal/IGmsCallbacks.aidl
diff --git a/...ms/common/internal/IGmsServiceBroker.aidl → ...ms/common/internal/IGmsServiceBroker.aidl b/...ms/common/internal/IGmsServiceBroker.aidl → ...ms/common/internal/IGmsServiceBroker.aidl
diff --git a/...common/internal/ISignInButtonCreator.aidl → ...common/internal/ISignInButtonCreator.aidl b/...common/internal/ISignInButtonCreator.aidl → ...common/internal/ISignInButtonCreator.aidl
diff --git a/.../common/server/FavaDiagnosticsEntity.aidl → .../common/server/FavaDiagnosticsEntity.aidl b/.../common/server/FavaDiagnosticsEntity.aidl → .../common/server/FavaDiagnosticsEntity.aidl
diff --git a/...e/android/gms/dynamic/IObjectWrapper.aidl → ...e/android/gms/dynamic/IObjectWrapper.aidl b/...e/android/gms/dynamic/IObjectWrapper.aidl → ...e/android/gms/dynamic/IObjectWrapper.aidl
diff --git a/...google/android/gms/location/Geofence.aidl → ...google/android/gms/location/Geofence.aidl b/...google/android/gms/location/Geofence.aidl → ...google/android/gms/location/Geofence.aidl
diff --git a/...droid/gms/location/GeofencingRequest.aidl → ...droid/gms/location/GeofencingRequest.aidl b/...droid/gms/location/GeofencingRequest.aidl → ...droid/gms/location/GeofencingRequest.aidl
diff --git a/...droid/gms/location/ILocationListener.aidl → ...droid/gms/location/ILocationListener.aidl b/...droid/gms/location/ILocationListener.aidl → ...droid/gms/location/ILocationListener.aidl
diff --git a/...android/gms/location/LocationRequest.aidl → ...android/gms/location/LocationRequest.aidl b/...android/gms/location/LocationRequest.aidl → ...android/gms/location/LocationRequest.aidl
diff --git a/.../android/gms/location/LocationStatus.aidl → .../android/gms/location/LocationStatus.aidl b/.../android/gms/location/LocationStatus.aidl → .../android/gms/location/LocationStatus.aidl
diff --git a/...ocation/internal/IGeofencerCallbacks.aidl → ...ocation/internal/IGeofencerCallbacks.aidl b/...ocation/internal/IGeofencerCallbacks.aidl → ...ocation/internal/IGeofencerCallbacks.aidl
diff --git a/...ternal/IGoogleLocationManagerService.aidl → ...ternal/IGoogleLocationManagerService.aidl b/...ternal/IGoogleLocationManagerService.aidl → ...ternal/IGoogleLocationManagerService.aidl
diff --git a/...ion/internal/LocationRequestInternal.aidl → ...ion/internal/LocationRequestInternal.aidl b/...ion/internal/LocationRequestInternal.aidl → ...ion/internal/LocationRequestInternal.aidl
diff --git a/...s/location/places/AutocompleteFilter.aidl → ...s/location/places/AutocompleteFilter.aidl b/...s/location/places/AutocompleteFilter.aidl → ...s/location/places/AutocompleteFilter.aidl
diff --git a/...s/location/places/NearbyAlertRequest.aidl → ...s/location/places/NearbyAlertRequest.aidl b/...s/location/places/NearbyAlertRequest.aidl → ...s/location/places/NearbyAlertRequest.aidl
diff --git a/...roid/gms/location/places/PlaceFilter.aidl → ...roid/gms/location/places/PlaceFilter.aidl b/...roid/gms/location/places/PlaceFilter.aidl → ...roid/gms/location/places/PlaceFilter.aidl
diff --git a/...roid/gms/location/places/PlaceReport.aidl → ...roid/gms/location/places/PlaceReport.aidl b/...roid/gms/location/places/PlaceReport.aidl → ...roid/gms/location/places/PlaceReport.aidl
diff --git a/...oid/gms/location/places/PlaceRequest.aidl → ...oid/gms/location/places/PlaceRequest.aidl b/...oid/gms/location/places/PlaceRequest.aidl → ...oid/gms/location/places/PlaceRequest.aidl
diff --git a/...d/gms/location/places/UserAddedPlace.aidl → ...d/gms/location/places/UserAddedPlace.aidl b/...d/gms/location/places/UserAddedPlace.aidl → ...d/gms/location/places/UserAddedPlace.aidl
diff --git a/...oid/gms/location/places/UserDataType.aidl → ...oid/gms/location/places/UserDataType.aidl b/...oid/gms/location/places/UserDataType.aidl → ...oid/gms/location/places/UserDataType.aidl
diff --git a/...ion/places/internal/IPlacesCallbacks.aidl → ...ion/places/internal/IPlacesCallbacks.aidl b/...ion/places/internal/IPlacesCallbacks.aidl → ...ion/places/internal/IPlacesCallbacks.aidl
diff --git a/...ocation/places/internal/PlacesParams.aidl → ...ocation/places/internal/PlacesParams.aidl b/...ocation/places/internal/PlacesParams.aidl → ...ocation/places/internal/PlacesParams.aidl
diff --git a/...ms/location/reporting/ReportingState.aidl → ...ms/location/reporting/ReportingState.aidl b/...ms/location/reporting/ReportingState.aidl → ...ms/location/reporting/ReportingState.aidl
diff --git a/...reporting/internal/IReportingService.aidl → ...reporting/internal/IReportingService.aidl b/...reporting/internal/IReportingService.aidl → ...reporting/internal/IReportingService.aidl
diff --git a/...le/android/gms/maps/GoogleMapOptions.aidl → ...le/android/gms/maps/GoogleMapOptions.aidl b/...le/android/gms/maps/GoogleMapOptions.aidl → ...le/android/gms/maps/GoogleMapOptions.aidl
diff --git a/...nternal/ICameraUpdateFactoryDelegate.aidl → ...nternal/ICameraUpdateFactoryDelegate.aidl b/...nternal/ICameraUpdateFactoryDelegate.aidl → ...nternal/ICameraUpdateFactoryDelegate.aidl
diff --git a/...ms/maps/internal/ICancelableCallback.aidl → ...ms/maps/internal/ICancelableCallback.aidl b/...ms/maps/internal/ICancelableCallback.aidl → ...ms/maps/internal/ICancelableCallback.aidl
diff --git a/...e/android/gms/maps/internal/ICreator.aidl → ...e/android/gms/maps/internal/ICreator.aidl b/...e/android/gms/maps/internal/ICreator.aidl → ...e/android/gms/maps/internal/ICreator.aidl
diff --git a/...gms/maps/internal/IGoogleMapDelegate.aidl → ...gms/maps/internal/IGoogleMapDelegate.aidl b/...gms/maps/internal/IGoogleMapDelegate.aidl → ...gms/maps/internal/IGoogleMapDelegate.aidl
diff --git a/...gms/maps/internal/IInfoWindowAdapter.aidl → ...gms/maps/internal/IInfoWindowAdapter.aidl b/...gms/maps/internal/IInfoWindowAdapter.aidl → ...gms/maps/internal/IInfoWindowAdapter.aidl
diff --git a/...aps/internal/ILocationSourceDelegate.aidl → ...aps/internal/ILocationSourceDelegate.aidl b/...aps/internal/ILocationSourceDelegate.aidl → ...aps/internal/ILocationSourceDelegate.aidl
diff --git a/...s/maps/internal/IMapFragmentDelegate.aidl → ...s/maps/internal/IMapFragmentDelegate.aidl b/...s/maps/internal/IMapFragmentDelegate.aidl → ...s/maps/internal/IMapFragmentDelegate.aidl
diff --git a/...d/gms/maps/internal/IMapViewDelegate.aidl → ...d/gms/maps/internal/IMapViewDelegate.aidl b/...d/gms/maps/internal/IMapViewDelegate.aidl → ...d/gms/maps/internal/IMapViewDelegate.aidl
diff --git a/...aps/internal/IOnCameraChangeListener.aidl → ...aps/internal/IOnCameraChangeListener.aidl b/...aps/internal/IOnCameraChangeListener.aidl → ...aps/internal/IOnCameraChangeListener.aidl
diff --git a/.../internal/IOnInfoWindowClickListener.aidl → .../internal/IOnInfoWindowClickListener.aidl b/.../internal/IOnInfoWindowClickListener.aidl → .../internal/IOnInfoWindowClickListener.aidl
diff --git a/...ms/maps/internal/IOnMapClickListener.aidl → ...ms/maps/internal/IOnMapClickListener.aidl b/...ms/maps/internal/IOnMapClickListener.aidl → ...ms/maps/internal/IOnMapClickListener.aidl
diff --git a/...s/maps/internal/IOnMapLoadedCallback.aidl → ...s/maps/internal/IOnMapLoadedCallback.aidl b/...s/maps/internal/IOnMapLoadedCallback.aidl → ...s/maps/internal/IOnMapLoadedCallback.aidl
diff --git a/...aps/internal/IOnMapLongClickListener.aidl → ...aps/internal/IOnMapLongClickListener.aidl b/...aps/internal/IOnMapLongClickListener.aidl → ...aps/internal/IOnMapLongClickListener.aidl
diff --git a/...maps/internal/IOnMarkerClickListener.aidl → ...maps/internal/IOnMarkerClickListener.aidl b/...maps/internal/IOnMarkerClickListener.aidl → ...maps/internal/IOnMarkerClickListener.aidl
diff --git a/.../maps/internal/IOnMarkerDragListener.aidl → .../maps/internal/IOnMarkerDragListener.aidl b/.../maps/internal/IOnMarkerDragListener.aidl → .../maps/internal/IOnMarkerDragListener.aidl
diff --git a/...nal/IOnMyLocationButtonClickListener.aidl → ...nal/IOnMyLocationButtonClickListener.aidl b/...nal/IOnMyLocationButtonClickListener.aidl → ...nal/IOnMyLocationButtonClickListener.aidl
diff --git a/...internal/IOnMyLocationChangeListener.aidl → ...internal/IOnMyLocationChangeListener.aidl b/...internal/IOnMyLocationChangeListener.aidl → ...internal/IOnMyLocationChangeListener.aidl
diff --git a/...ms/maps/internal/IProjectionDelegate.aidl → ...ms/maps/internal/IProjectionDelegate.aidl b/...ms/maps/internal/IProjectionDelegate.aidl → ...ms/maps/internal/IProjectionDelegate.aidl
diff --git a/...maps/internal/ISnapshotReadyCallback.aidl → ...maps/internal/ISnapshotReadyCallback.aidl b/...maps/internal/ISnapshotReadyCallback.aidl → ...maps/internal/ISnapshotReadyCallback.aidl
diff --git a/...ms/maps/internal/IUiSettingsDelegate.aidl → ...ms/maps/internal/IUiSettingsDelegate.aidl b/...ms/maps/internal/IUiSettingsDelegate.aidl → ...ms/maps/internal/IUiSettingsDelegate.aidl
diff --git a/...ndroid/gms/maps/model/CameraPosition.aidl → ...ndroid/gms/maps/model/CameraPosition.aidl b/...ndroid/gms/maps/model/CameraPosition.aidl → ...ndroid/gms/maps/model/CameraPosition.aidl
diff --git a/...android/gms/maps/model/CircleOptions.aidl → ...android/gms/maps/model/CircleOptions.aidl b/...android/gms/maps/model/CircleOptions.aidl → ...android/gms/maps/model/CircleOptions.aidl
diff --git a/.../gms/maps/model/GroundOverlayOptions.aidl → .../gms/maps/model/GroundOverlayOptions.aidl b/.../gms/maps/model/GroundOverlayOptions.aidl → .../gms/maps/model/GroundOverlayOptions.aidl
diff --git a/...google/android/gms/maps/model/LatLng.aidl → ...google/android/gms/maps/model/LatLng.aidl b/...google/android/gms/maps/model/LatLng.aidl → ...google/android/gms/maps/model/LatLng.aidl
diff --git a/.../android/gms/maps/model/LatLngBounds.aidl → .../android/gms/maps/model/LatLngBounds.aidl b/.../android/gms/maps/model/LatLngBounds.aidl → .../android/gms/maps/model/LatLngBounds.aidl
diff --git a/...android/gms/maps/model/MarkerOptions.aidl → ...android/gms/maps/model/MarkerOptions.aidl b/...android/gms/maps/model/MarkerOptions.aidl → ...android/gms/maps/model/MarkerOptions.aidl
diff --git a/...ndroid/gms/maps/model/PolygonOptions.aidl → ...ndroid/gms/maps/model/PolygonOptions.aidl b/...ndroid/gms/maps/model/PolygonOptions.aidl → ...ndroid/gms/maps/model/PolygonOptions.aidl
diff --git a/...droid/gms/maps/model/PolylineOptions.aidl → ...droid/gms/maps/model/PolylineOptions.aidl b/...droid/gms/maps/model/PolylineOptions.aidl → ...droid/gms/maps/model/PolylineOptions.aidl
diff --git a/...m/google/android/gms/maps/model/Tile.aidl → ...m/google/android/gms/maps/model/Tile.aidl b/...m/google/android/gms/maps/model/Tile.aidl → ...m/google/android/gms/maps/model/Tile.aidl
diff --git a/...id/gms/maps/model/TileOverlayOptions.aidl → ...id/gms/maps/model/TileOverlayOptions.aidl b/...id/gms/maps/model/TileOverlayOptions.aidl → ...id/gms/maps/model/TileOverlayOptions.aidl
diff --git a/...android/gms/maps/model/VisibleRegion.aidl → ...android/gms/maps/model/VisibleRegion.aidl b/...android/gms/maps/model/VisibleRegion.aidl → ...android/gms/maps/model/VisibleRegion.aidl
diff --git a/...nal/IBitmapDescriptorFactoryDelegate.aidl → ...nal/IBitmapDescriptorFactoryDelegate.aidl b/...nal/IBitmapDescriptorFactoryDelegate.aidl → ...nal/IBitmapDescriptorFactoryDelegate.aidl
diff --git a/.../maps/model/internal/ICircleDelegate.aidl → .../maps/model/internal/ICircleDelegate.aidl b/.../maps/model/internal/ICircleDelegate.aidl → .../maps/model/internal/ICircleDelegate.aidl
diff --git a/...odel/internal/IGroundOverlayDelegate.aidl → ...odel/internal/IGroundOverlayDelegate.aidl b/...odel/internal/IGroundOverlayDelegate.aidl → ...odel/internal/IGroundOverlayDelegate.aidl
diff --git a/.../maps/model/internal/IMarkerDelegate.aidl → .../maps/model/internal/IMarkerDelegate.aidl b/.../maps/model/internal/IMarkerDelegate.aidl → .../maps/model/internal/IMarkerDelegate.aidl
diff --git a/...maps/model/internal/IPolygonDelegate.aidl → ...maps/model/internal/IPolygonDelegate.aidl b/...maps/model/internal/IPolygonDelegate.aidl → ...maps/model/internal/IPolygonDelegate.aidl
diff --git a/...aps/model/internal/IPolylineDelegate.aidl → ...aps/model/internal/IPolylineDelegate.aidl b/...aps/model/internal/IPolylineDelegate.aidl → ...aps/model/internal/IPolylineDelegate.aidl
diff --git a/.../model/internal/ITileOverlayDelegate.aidl → .../model/internal/ITileOverlayDelegate.aidl b/.../model/internal/ITileOverlayDelegate.aidl → .../model/internal/ITileOverlayDelegate.aidl
diff --git a/...model/internal/ITileProviderDelegate.aidl → ...model/internal/ITileProviderDelegate.aidl b/...model/internal/ITileProviderDelegate.aidl → ...model/internal/ITileProviderDelegate.aidl
diff --git a/...gms/people/internal/IPeopleCallbacks.aidl → ...gms/people/internal/IPeopleCallbacks.aidl b/...gms/people/internal/IPeopleCallbacks.aidl → ...gms/people/internal/IPeopleCallbacks.aidl
diff --git a/...d/gms/people/internal/IPeopleService.aidl → ...d/gms/people/internal/IPeopleService.aidl b/...d/gms/people/internal/IPeopleService.aidl → ...d/gms/people/internal/IPeopleService.aidl
diff --git a/.../plus/internal/IPlusOneButtonCreator.aidl → .../plus/internal/IPlusOneButtonCreator.aidl b/.../plus/internal/IPlusOneButtonCreator.aidl → .../plus/internal/IPlusOneButtonCreator.aidl
diff --git a/...droid/gms/appdatasearch/CorpusStatus.java → ...droid/gms/appdatasearch/CorpusStatus.java b/...droid/gms/appdatasearch/CorpusStatus.java → ...droid/gms/appdatasearch/CorpusStatus.java
diff --git a/...s/appdatasearch/SuggestSpecification.java → ...s/appdatasearch/SuggestSpecification.java b/...s/appdatasearch/SuggestSpecification.java → ...s/appdatasearch/SuggestSpecification.java
diff --git a/.../gms/appdatasearch/SuggestionResults.java → .../gms/appdatasearch/SuggestionResults.java b/.../gms/appdatasearch/SuggestionResults.java → .../gms/appdatasearch/SuggestionResults.java
diff --git a/.../android/gms/appdatasearch/UsageInfo.java → .../android/gms/appdatasearch/UsageInfo.java b/.../android/gms/appdatasearch/UsageInfo.java → .../android/gms/appdatasearch/UsageInfo.java
diff --git a/.../android/gms/auth/AccountChangeEvent.java → .../android/gms/auth/AccountChangeEvent.java b/.../android/gms/auth/AccountChangeEvent.java → .../android/gms/auth/AccountChangeEvent.java
diff --git a/.../gms/auth/AccountChangeEventsRequest.java → .../gms/auth/AccountChangeEventsRequest.java b/.../gms/auth/AccountChangeEventsRequest.java → .../gms/auth/AccountChangeEventsRequest.java
diff --git a/...gms/auth/AccountChangeEventsResponse.java → ...gms/auth/AccountChangeEventsResponse.java b/...gms/auth/AccountChangeEventsResponse.java → ...gms/auth/AccountChangeEventsResponse.java
diff --git a/.../firstparty/dataservice/TokenRequest.java → .../firstparty/dataservice/TokenRequest.java b/.../firstparty/dataservice/TokenRequest.java → .../firstparty/dataservice/TokenRequest.java
diff --git a/...firstparty/dataservice/TokenResponse.java → ...firstparty/dataservice/TokenResponse.java b/...firstparty/dataservice/TokenResponse.java → ...firstparty/dataservice/TokenResponse.java
diff --git a/...uth/firstparty/proximity/data/Permit.java → ...uth/firstparty/proximity/data/Permit.java b/...uth/firstparty/proximity/data/Permit.java → ...uth/firstparty/proximity/data/Permit.java
diff --git a/...com/google/android/gms/common/Scopes.java → ...com/google/android/gms/common/Scopes.java b/...com/google/android/gms/common/Scopes.java → ...com/google/android/gms/common/Scopes.java
diff --git a/...e/android/gms/common/api/AccountInfo.java → ...e/android/gms/common/api/AccountInfo.java b/...e/android/gms/common/api/AccountInfo.java → ...e/android/gms/common/api/AccountInfo.java
diff --git a/...oid/gms/common/api/CommonStatusCodes.java → ...oid/gms/common/api/CommonStatusCodes.java b/...oid/gms/common/api/CommonStatusCodes.java → ...oid/gms/common/api/CommonStatusCodes.java
diff --git a/...google/android/gms/common/api/Result.java → ...google/android/gms/common/api/Result.java b/...google/android/gms/common/api/Result.java → ...google/android/gms/common/api/Result.java
diff --git a/.../google/android/gms/common/api/Scope.java → .../google/android/gms/common/api/Scope.java b/.../google/android/gms/common/api/Scope.java → .../google/android/gms/common/api/Scope.java
diff --git a/...google/android/gms/common/api/Status.java → ...google/android/gms/common/api/Status.java b/...google/android/gms/common/api/Status.java → ...google/android/gms/common/api/Status.java
diff --git a/...e/android/gms/common/data/DataHolder.java → ...e/android/gms/common/data/DataHolder.java b/...e/android/gms/common/data/DataHolder.java → ...e/android/gms/common/data/DataHolder.java
diff --git a/.../common/server/FavaDiagnosticsEntity.java → .../common/server/FavaDiagnosticsEntity.java b/.../common/server/FavaDiagnosticsEntity.java → .../common/server/FavaDiagnosticsEntity.java
diff --git a/...ive/metadata/internal/MetadataBundle.java → ...ive/metadata/internal/MetadataBundle.java b/...ive/metadata/internal/MetadataBundle.java → ...ive/metadata/internal/MetadataBundle.java
diff --git a/...le/android/gms/dynamic/ObjectWrapper.java → ...le/android/gms/dynamic/ObjectWrapper.java b/...le/android/gms/dynamic/ObjectWrapper.java → ...le/android/gms/dynamic/ObjectWrapper.java
diff --git a/...e/android/gms/fitness/data/DataPoint.java → ...e/android/gms/fitness/data/DataPoint.java b/...e/android/gms/fitness/data/DataPoint.java → ...e/android/gms/fitness/data/DataPoint.java
diff --git a/...ogle/android/gms/fitness/data/Device.java → ...ogle/android/gms/fitness/data/Device.java b/...ogle/android/gms/fitness/data/Device.java → ...ogle/android/gms/fitness/data/Device.java
diff --git a/...oogle/android/gms/fitness/data/Field.java → ...oogle/android/gms/fitness/data/Field.java b/...oogle/android/gms/fitness/data/Field.java → ...oogle/android/gms/fitness/data/Field.java
diff --git a/...oogle/android/gms/fitness/data/Value.java → ...oogle/android/gms/fitness/data/Value.java b/...oogle/android/gms/fitness/data/Value.java → ...oogle/android/gms/fitness/data/Value.java
diff --git a/...ms/identity/accounts/api/AccountData.java → ...ms/identity/accounts/api/AccountData.java b/...ms/identity/accounts/api/AccountData.java → ...ms/identity/accounts/api/AccountData.java
diff --git a/...y/intents/model/CountrySpecification.java → ...y/intents/model/CountrySpecification.java b/...y/intents/model/CountrySpecification.java → ...y/intents/model/CountrySpecification.java
diff --git a/...s/identity/intents/model/UserAddress.java → ...s/identity/intents/model/UserAddress.java b/...s/identity/intents/model/UserAddress.java → ...s/identity/intents/model/UserAddress.java
diff --git a/...google/android/gms/location/Geofence.java → ...google/android/gms/location/Geofence.java b/...google/android/gms/location/Geofence.java → ...google/android/gms/location/Geofence.java
diff --git a/...droid/gms/location/GeofencingRequest.java → ...droid/gms/location/GeofencingRequest.java b/...droid/gms/location/GeofencingRequest.java → ...droid/gms/location/GeofencingRequest.java
diff --git a/...android/gms/location/LocationRequest.java → ...android/gms/location/LocationRequest.java b/...android/gms/location/LocationRequest.java → ...android/gms/location/LocationRequest.java
diff --git a/.../android/gms/location/LocationStatus.java → .../android/gms/location/LocationStatus.java b/.../android/gms/location/LocationStatus.java → .../android/gms/location/LocationStatus.java
diff --git a/...gms/location/internal/ClientIdentity.java → ...gms/location/internal/ClientIdentity.java b/...gms/location/internal/ClientIdentity.java → ...gms/location/internal/ClientIdentity.java
diff --git a/...ion/internal/LocationRequestInternal.java → ...ion/internal/LocationRequestInternal.java b/...ion/internal/LocationRequestInternal.java → ...ion/internal/LocationRequestInternal.java
diff --git a/...s/location/places/AutocompleteFilter.java → ...s/location/places/AutocompleteFilter.java b/...s/location/places/AutocompleteFilter.java → ...s/location/places/AutocompleteFilter.java
diff --git a/...s/location/places/NearbyAlertRequest.java → ...s/location/places/NearbyAlertRequest.java b/...s/location/places/NearbyAlertRequest.java → ...s/location/places/NearbyAlertRequest.java
diff --git a/...roid/gms/location/places/PlaceFilter.java → ...roid/gms/location/places/PlaceFilter.java b/...roid/gms/location/places/PlaceFilter.java → ...roid/gms/location/places/PlaceFilter.java
diff --git a/...roid/gms/location/places/PlaceReport.java → ...roid/gms/location/places/PlaceReport.java b/...roid/gms/location/places/PlaceReport.java → ...roid/gms/location/places/PlaceReport.java
diff --git a/...oid/gms/location/places/PlaceRequest.java → ...oid/gms/location/places/PlaceRequest.java b/...oid/gms/location/places/PlaceRequest.java → ...oid/gms/location/places/PlaceRequest.java
diff --git a/...d/gms/location/places/UserAddedPlace.java → ...d/gms/location/places/UserAddedPlace.java b/...d/gms/location/places/UserAddedPlace.java → ...d/gms/location/places/UserAddedPlace.java
diff --git a/...oid/gms/location/places/UserDataType.java → ...oid/gms/location/places/UserDataType.java b/...oid/gms/location/places/UserDataType.java → ...oid/gms/location/places/UserDataType.java
diff --git a/...ocation/places/internal/PlacesParams.java → ...ocation/places/internal/PlacesParams.java b/...ocation/places/internal/PlacesParams.java → ...ocation/places/internal/PlacesParams.java
diff --git a/...ms/location/reporting/ReportingState.java → ...ms/location/reporting/ReportingState.java b/...ms/location/reporting/ReportingState.java → ...ms/location/reporting/ReportingState.java
diff --git a/...le/android/gms/maps/GoogleMapOptions.java → ...le/android/gms/maps/GoogleMapOptions.java b/...le/android/gms/maps/GoogleMapOptions.java → ...le/android/gms/maps/GoogleMapOptions.java
diff --git a/...d/gms/maps/StreetViewPanoramaOptions.java → ...d/gms/maps/StreetViewPanoramaOptions.java b/...d/gms/maps/StreetViewPanoramaOptions.java → ...d/gms/maps/StreetViewPanoramaOptions.java
diff --git a/...ogle/android/gms/maps/internal/Point.java → ...ogle/android/gms/maps/internal/Point.java b/...ogle/android/gms/maps/internal/Point.java → ...ogle/android/gms/maps/internal/Point.java
diff --git a/...roid/gms/maps/model/BitmapDescriptor.java → ...roid/gms/maps/model/BitmapDescriptor.java b/...roid/gms/maps/model/BitmapDescriptor.java → ...roid/gms/maps/model/BitmapDescriptor.java
diff --git a/...ndroid/gms/maps/model/CameraPosition.java → ...ndroid/gms/maps/model/CameraPosition.java b/...ndroid/gms/maps/model/CameraPosition.java → ...ndroid/gms/maps/model/CameraPosition.java
diff --git a/...android/gms/maps/model/CircleOptions.java → ...android/gms/maps/model/CircleOptions.java b/...android/gms/maps/model/CircleOptions.java → ...android/gms/maps/model/CircleOptions.java
diff --git a/.../gms/maps/model/GroundOverlayOptions.java → .../gms/maps/model/GroundOverlayOptions.java b/.../gms/maps/model/GroundOverlayOptions.java → .../gms/maps/model/GroundOverlayOptions.java
diff --git a/...google/android/gms/maps/model/LatLng.java → ...google/android/gms/maps/model/LatLng.java b/...google/android/gms/maps/model/LatLng.java → ...google/android/gms/maps/model/LatLng.java
diff --git a/.../android/gms/maps/model/LatLngBounds.java → .../android/gms/maps/model/LatLngBounds.java b/.../android/gms/maps/model/LatLngBounds.java → .../android/gms/maps/model/LatLngBounds.java
diff --git a/...android/gms/maps/model/MarkerOptions.java → ...android/gms/maps/model/MarkerOptions.java b/...android/gms/maps/model/MarkerOptions.java → ...android/gms/maps/model/MarkerOptions.java
diff --git a/...ndroid/gms/maps/model/PolygonOptions.java → ...ndroid/gms/maps/model/PolygonOptions.java b/...ndroid/gms/maps/model/PolygonOptions.java → ...ndroid/gms/maps/model/PolygonOptions.java
diff --git a/...droid/gms/maps/model/PolylineOptions.java → ...droid/gms/maps/model/PolylineOptions.java b/...droid/gms/maps/model/PolylineOptions.java → ...droid/gms/maps/model/PolylineOptions.java
diff --git a/.../maps/model/StreetViewPanoramaCamera.java → .../maps/model/StreetViewPanoramaCamera.java b/.../maps/model/StreetViewPanoramaCamera.java → .../maps/model/StreetViewPanoramaCamera.java
diff --git a/...ms/maps/model/StreetViewPanoramaLink.java → ...ms/maps/model/StreetViewPanoramaLink.java b/...ms/maps/model/StreetViewPanoramaLink.java → ...ms/maps/model/StreetViewPanoramaLink.java
diff --git a/...aps/model/StreetViewPanoramaLocation.java → ...aps/model/StreetViewPanoramaLocation.java b/...aps/model/StreetViewPanoramaLocation.java → ...aps/model/StreetViewPanoramaLocation.java
diff --git a/.../model/StreetViewPanoramaOrientation.java → .../model/StreetViewPanoramaOrientation.java b/.../model/StreetViewPanoramaOrientation.java → .../model/StreetViewPanoramaOrientation.java
diff --git a/...m/google/android/gms/maps/model/Tile.java → ...m/google/android/gms/maps/model/Tile.java b/...m/google/android/gms/maps/model/Tile.java → ...m/google/android/gms/maps/model/Tile.java
diff --git a/...id/gms/maps/model/TileOverlayOptions.java → ...id/gms/maps/model/TileOverlayOptions.java b/...id/gms/maps/model/TileOverlayOptions.java → ...id/gms/maps/model/TileOverlayOptions.java
diff --git a/.../android/gms/maps/model/TileProvider.java → .../android/gms/maps/model/TileProvider.java b/.../android/gms/maps/model/TileProvider.java → .../android/gms/maps/model/TileProvider.java
diff --git a/...android/gms/maps/model/VisibleRegion.java → ...android/gms/maps/model/VisibleRegion.java b/...android/gms/maps/model/VisibleRegion.java → ...android/gms/maps/model/VisibleRegion.java
diff --git a/.../android/gms/maps/model/package-info.java → .../android/gms/maps/model/package-info.java b/.../android/gms/maps/model/package-info.java → .../android/gms/maps/model/package-info.java
diff --git a/...oid/gms/people/model/AccountMetadata.java → ...oid/gms/people/model/AccountMetadata.java b/...oid/gms/people/model/AccountMetadata.java → ...oid/gms/people/model/AccountMetadata.java
diff --git a/...d/gms/plus/internal/PlusCommonExtras.java → ...d/gms/plus/internal/PlusCommonExtras.java b/...d/gms/plus/internal/PlusCommonExtras.java → ...d/gms/plus/internal/PlusCommonExtras.java
diff --git a/...ndroid/gms/plus/internal/PlusSession.java → ...ndroid/gms/plus/internal/PlusSession.java b/...ndroid/gms/plus/internal/PlusSession.java → ...ndroid/gms/plus/internal/PlusSession.java
diff --git a/...nal/model/smart_profile/CardsRequest.java → ...nal/model/smart_profile/CardsRequest.java b/...nal/model/smart_profile/CardsRequest.java → ...nal/model/smart_profile/CardsRequest.java
diff --git a/...al/model/smart_profile/CardsResponse.java → ...al/model/smart_profile/CardsResponse.java b/...al/model/smart_profile/CardsResponse.java → ...al/model/smart_profile/CardsResponse.java
diff --git a/...art_profile/PeopleForProfilesRequest.java → ...art_profile/PeopleForProfilesRequest.java b/...art_profile/PeopleForProfilesRequest.java → ...art_profile/PeopleForProfilesRequest.java
diff --git a/...rt_profile/PeopleForProfilesResponse.java → ...rt_profile/PeopleForProfilesResponse.java b/...rt_profile/PeopleForProfilesResponse.java → ...rt_profile/PeopleForProfilesResponse.java
diff --git a/...android/gms/plus/model/posts/Comment.java → ...android/gms/plus/model/posts/Comment.java b/...android/gms/plus/model/posts/Comment.java → ...android/gms/plus/model/posts/Comment.java
diff --git a/...le/android/gms/plus/model/posts/Post.java → ...le/android/gms/plus/model/posts/Post.java b/...le/android/gms/plus/model/posts/Post.java → ...le/android/gms/plus/model/posts/Post.java
diff --git a/...ndroid/gms/plus/model/posts/Settings.java → ...ndroid/gms/plus/model/posts/Settings.java b/...ndroid/gms/plus/model/posts/Settings.java → ...ndroid/gms/plus/model/posts/Settings.java
diff --git a/...gms/wearable/ConnectionConfiguration.java → ...gms/wearable/ConnectionConfiguration.java b/...gms/wearable/ConnectionConfiguration.java → ...gms/wearable/ConnectionConfiguration.java
diff --git a/...com/google/android/gms/wearable/Node.java → ...com/google/android/gms/wearable/Node.java b/...com/google/android/gms/wearable/Node.java → ...com/google/android/gms/wearable/Node.java
diff --git a/...oid/gms/wearable/WearableStatusCodes.java → ...oid/gms/wearable/WearableStatusCodes.java b/...oid/gms/wearable/WearableStatusCodes.java → ...oid/gms/wearable/WearableStatusCodes.java
diff --git a/...gms/wearable/internal/NodeParcelable.java → ...gms/wearable/internal/NodeParcelable.java b/...gms/wearable/internal/NodeParcelable.java → ...gms/wearable/internal/NodeParcelable.java
diff --git a/...java/org/microg/gms/common/Constants.java → ...java/org/microg/gms/common/Constants.java b/...java/org/microg/gms/common/Constants.java → ...java/org/microg/gms/common/Constants.java
diff --git a/...java/org/microg/gms/common/PublicApi.java → ...java/org/microg/gms/common/PublicApi.java b/...java/org/microg/gms/common/PublicApi.java → ...java/org/microg/gms/common/PublicApi.java
diff --git a/safe-parcel b/safe-parcel
@@ -0,0 +1 @@
+extern/SafeParcel/safe-parcel
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,2 @@
-rootProject.name = 'play-services-api'
-
-include ':SafeParcel'
+include ':play-services-api'
+include ':safe-parcel'