diff --git a/.gitmodules b/.gitmodules index 20fd030..134f71c 100644 --- 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 index 8884543..fb4008d 100644 --- 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 deleted file mode 160000 index 0bb4f3d..0000000 --- a/SafeParcel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0bb4f3d602d8565bbf500a880f563a2b1fa47d1d diff --git a/extern/SafeParcel b/extern/SafeParcel new file mode 160000 index 0000000..454265f --- /dev/null +++ b/extern/SafeParcel @@ -0,0 +1 @@ +Subproject commit 454265fd3ee465cc0741a57f3a74a6e747c2fcd5 diff --git a/build.gradle b/play-services-api/build.gradle similarity index 87% rename from build.gradle rename to play-services-api/build.gradle index cd54816..2e94b77 100644 --- a/build.gradle +++ b/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 b/play-services-api/src/main/AndroidManifest.xml similarity index 100% rename from src/main/AndroidManifest.xml rename to play-services-api/src/main/AndroidManifest.xml diff --git a/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl b/play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl similarity index 100% rename from src/main/aidl/com/google/android/auth/IAuthManagerService.aidl rename to play-services-api/src/main/aidl/com/google/android/auth/IAuthManagerService.aidl diff --git a/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/CorpusStatus.aidl diff --git a/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestSpecification.aidl diff --git a/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/SuggestionResults.aidl diff --git a/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/UsageInfo.aidl diff --git a/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/IAppDataSearch.aidl diff --git a/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearch.aidl diff --git a/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/appdatasearch/internal/ILightweightAppDataSearchCallbacks.aidl diff --git a/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsRequest.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/auth/AccountChangeEventsRequest.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsRequest.aidl diff --git a/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsResponse.aidl b/play-services-api/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsResponse.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/auth/AccountChangeEventsResponse.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/auth/AccountChangeEventsResponse.aidl diff --git a/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl diff --git a/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl diff --git a/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl diff --git a/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl diff --git a/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl diff --git a/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl b/play-services-api/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl diff --git a/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl b/play-services-api/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl diff --git a/src/main/aidl/com/google/android/gms/location/Geofence.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/Geofence.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/Geofence.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/Geofence.aidl diff --git a/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl diff --git a/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/ILocationListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl diff --git a/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/LocationRequest.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl diff --git a/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/LocationStatus.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl diff --git a/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl diff --git a/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl diff --git a/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl diff --git a/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl diff --git a/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl diff --git a/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/GoogleMapOptions.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICameraUpdateFactoryDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICancelableCallback.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ICreator.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IGoogleMapDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IInfoWindowAdapter.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ILocationSourceDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapFragmentDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IMapViewDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnCameraChangeListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnInfoWindowClickListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapClickListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLoadedCallback.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMapLongClickListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerClickListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMarkerDragListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationButtonClickListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IOnMyLocationChangeListener.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IProjectionDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IProjectionDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IProjectionDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IProjectionDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/ISnapshotReadyCallback.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/internal/IUiSettingsDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/CameraPosition.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/CameraPosition.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/CameraPosition.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/CameraPosition.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/CircleOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/CircleOptions.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/CircleOptions.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/CircleOptions.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/GroundOverlayOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/GroundOverlayOptions.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/GroundOverlayOptions.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/GroundOverlayOptions.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/MarkerOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/MarkerOptions.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/MarkerOptions.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/MarkerOptions.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/PolygonOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/PolygonOptions.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/PolygonOptions.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/PolygonOptions.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/PolylineOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/PolylineOptions.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/PolylineOptions.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/PolylineOptions.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/Tile.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/Tile.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/Tile.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/Tile.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/TileOverlayOptions.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/TileOverlayOptions.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/TileOverlayOptions.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/TileOverlayOptions.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/VisibleRegion.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/VisibleRegion.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/VisibleRegion.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/VisibleRegion.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IBitmapDescriptorFactoryDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/ICircleDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IGroundOverlayDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IMarkerDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IPolygonDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/IPolylineDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/ITileOverlayDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl b/play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/maps/model/internal/ITileProviderDelegate.aidl diff --git a/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleCallbacks.aidl diff --git a/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl b/play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/people/internal/IPeopleService.aidl diff --git a/src/main/aidl/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl b/play-services-api/src/main/aidl/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl similarity index 100% rename from src/main/aidl/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl rename to play-services-api/src/main/aidl/com/google/android/gms/plus/internal/IPlusOneButtonCreator.aidl diff --git a/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java similarity index 100% rename from src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java rename to play-services-api/src/main/java/com/google/android/gms/appdatasearch/CorpusStatus.java diff --git a/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java similarity index 100% rename from src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java rename to play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestSpecification.java diff --git a/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java similarity index 100% rename from src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java rename to play-services-api/src/main/java/com/google/android/gms/appdatasearch/SuggestionResults.java diff --git a/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java b/play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java similarity index 100% rename from src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java rename to play-services-api/src/main/java/com/google/android/gms/appdatasearch/UsageInfo.java diff --git a/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java similarity index 100% rename from src/main/java/com/google/android/gms/auth/AccountChangeEvent.java rename to play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEvent.java diff --git a/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java rename to play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsRequest.java diff --git a/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java b/play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java similarity index 100% rename from src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java rename to play-services-api/src/main/java/com/google/android/gms/auth/AccountChangeEventsResponse.java diff --git a/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java b/play-services-api/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java rename to play-services-api/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenRequest.java diff --git a/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java b/play-services-api/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java similarity index 100% rename from src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java rename to play-services-api/src/main/java/com/google/android/gms/auth/firstparty/dataservice/TokenResponse.java diff --git a/src/main/java/com/google/android/gms/auth/firstparty/proximity/data/Permit.java b/play-services-api/src/main/java/com/google/android/gms/auth/firstparty/proximity/data/Permit.java similarity index 100% rename from src/main/java/com/google/android/gms/auth/firstparty/proximity/data/Permit.java rename to play-services-api/src/main/java/com/google/android/gms/auth/firstparty/proximity/data/Permit.java diff --git a/src/main/java/com/google/android/gms/common/Scopes.java b/play-services-api/src/main/java/com/google/android/gms/common/Scopes.java similarity index 100% rename from src/main/java/com/google/android/gms/common/Scopes.java rename to play-services-api/src/main/java/com/google/android/gms/common/Scopes.java diff --git a/src/main/java/com/google/android/gms/common/api/AccountInfo.java b/play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java similarity index 100% rename from src/main/java/com/google/android/gms/common/api/AccountInfo.java rename to play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java diff --git a/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java b/play-services-api/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java similarity index 100% rename from src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java rename to play-services-api/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java diff --git a/src/main/java/com/google/android/gms/common/api/Result.java b/play-services-api/src/main/java/com/google/android/gms/common/api/Result.java similarity index 100% rename from src/main/java/com/google/android/gms/common/api/Result.java rename to play-services-api/src/main/java/com/google/android/gms/common/api/Result.java diff --git a/src/main/java/com/google/android/gms/common/api/Scope.java b/play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java similarity index 100% rename from src/main/java/com/google/android/gms/common/api/Scope.java rename to play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java diff --git a/src/main/java/com/google/android/gms/common/api/Status.java b/play-services-api/src/main/java/com/google/android/gms/common/api/Status.java similarity index 100% rename from src/main/java/com/google/android/gms/common/api/Status.java rename to play-services-api/src/main/java/com/google/android/gms/common/api/Status.java diff --git a/src/main/java/com/google/android/gms/common/data/DataHolder.java b/play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java similarity index 100% rename from src/main/java/com/google/android/gms/common/data/DataHolder.java rename to play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java diff --git a/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java b/play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java similarity index 100% rename from src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java rename to play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java diff --git a/src/main/java/com/google/android/gms/drive/metadata/internal/MetadataBundle.java b/play-services-api/src/main/java/com/google/android/gms/drive/metadata/internal/MetadataBundle.java similarity index 100% rename from src/main/java/com/google/android/gms/drive/metadata/internal/MetadataBundle.java rename to play-services-api/src/main/java/com/google/android/gms/drive/metadata/internal/MetadataBundle.java diff --git a/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java b/play-services-api/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java similarity index 100% rename from src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java rename to play-services-api/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java diff --git a/src/main/java/com/google/android/gms/fitness/data/DataPoint.java b/play-services-api/src/main/java/com/google/android/gms/fitness/data/DataPoint.java similarity index 100% rename from src/main/java/com/google/android/gms/fitness/data/DataPoint.java rename to play-services-api/src/main/java/com/google/android/gms/fitness/data/DataPoint.java diff --git a/src/main/java/com/google/android/gms/fitness/data/Device.java b/play-services-api/src/main/java/com/google/android/gms/fitness/data/Device.java similarity index 100% rename from src/main/java/com/google/android/gms/fitness/data/Device.java rename to play-services-api/src/main/java/com/google/android/gms/fitness/data/Device.java diff --git a/src/main/java/com/google/android/gms/fitness/data/Field.java b/play-services-api/src/main/java/com/google/android/gms/fitness/data/Field.java similarity index 100% rename from src/main/java/com/google/android/gms/fitness/data/Field.java rename to play-services-api/src/main/java/com/google/android/gms/fitness/data/Field.java diff --git a/src/main/java/com/google/android/gms/fitness/data/Value.java b/play-services-api/src/main/java/com/google/android/gms/fitness/data/Value.java similarity index 100% rename from src/main/java/com/google/android/gms/fitness/data/Value.java rename to play-services-api/src/main/java/com/google/android/gms/fitness/data/Value.java diff --git a/src/main/java/com/google/android/gms/identity/accounts/api/AccountData.java b/play-services-api/src/main/java/com/google/android/gms/identity/accounts/api/AccountData.java similarity index 100% rename from src/main/java/com/google/android/gms/identity/accounts/api/AccountData.java rename to play-services-api/src/main/java/com/google/android/gms/identity/accounts/api/AccountData.java diff --git a/src/main/java/com/google/android/gms/identity/intents/model/CountrySpecification.java b/play-services-api/src/main/java/com/google/android/gms/identity/intents/model/CountrySpecification.java similarity index 100% rename from src/main/java/com/google/android/gms/identity/intents/model/CountrySpecification.java rename to play-services-api/src/main/java/com/google/android/gms/identity/intents/model/CountrySpecification.java diff --git a/src/main/java/com/google/android/gms/identity/intents/model/UserAddress.java b/play-services-api/src/main/java/com/google/android/gms/identity/intents/model/UserAddress.java similarity index 100% rename from src/main/java/com/google/android/gms/identity/intents/model/UserAddress.java rename to play-services-api/src/main/java/com/google/android/gms/identity/intents/model/UserAddress.java diff --git a/src/main/java/com/google/android/gms/location/Geofence.java b/play-services-api/src/main/java/com/google/android/gms/location/Geofence.java similarity index 100% rename from src/main/java/com/google/android/gms/location/Geofence.java rename to play-services-api/src/main/java/com/google/android/gms/location/Geofence.java diff --git a/src/main/java/com/google/android/gms/location/GeofencingRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/location/GeofencingRequest.java rename to play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java diff --git a/src/main/java/com/google/android/gms/location/LocationRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/location/LocationRequest.java rename to play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java diff --git a/src/main/java/com/google/android/gms/location/LocationStatus.java b/play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java similarity index 100% rename from src/main/java/com/google/android/gms/location/LocationStatus.java rename to play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java diff --git a/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java b/play-services-api/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java similarity index 100% rename from src/main/java/com/google/android/gms/location/internal/ClientIdentity.java rename to play-services-api/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java diff --git a/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java b/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java similarity index 100% rename from src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java rename to play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java diff --git a/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java b/play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java diff --git a/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java diff --git a/src/main/java/com/google/android/gms/location/places/PlaceFilter.java b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/PlaceFilter.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java diff --git a/src/main/java/com/google/android/gms/location/places/PlaceReport.java b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/PlaceReport.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java diff --git a/src/main/java/com/google/android/gms/location/places/PlaceRequest.java b/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/PlaceRequest.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java diff --git a/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java b/play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/UserAddedPlace.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java diff --git a/src/main/java/com/google/android/gms/location/places/UserDataType.java b/play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/UserDataType.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java diff --git a/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java b/play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java similarity index 100% rename from src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java rename to play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java diff --git a/src/main/java/com/google/android/gms/location/reporting/ReportingState.java b/play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java similarity index 100% rename from src/main/java/com/google/android/gms/location/reporting/ReportingState.java rename to play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java diff --git a/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/GoogleMapOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/GoogleMapOptions.java diff --git a/src/main/java/com/google/android/gms/maps/StreetViewPanoramaOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/StreetViewPanoramaOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/StreetViewPanoramaOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/StreetViewPanoramaOptions.java diff --git a/src/main/java/com/google/android/gms/maps/internal/Point.java b/play-services-api/src/main/java/com/google/android/gms/maps/internal/Point.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/internal/Point.java rename to play-services-api/src/main/java/com/google/android/gms/maps/internal/Point.java diff --git a/src/main/java/com/google/android/gms/maps/model/BitmapDescriptor.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/BitmapDescriptor.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/BitmapDescriptor.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/BitmapDescriptor.java diff --git a/src/main/java/com/google/android/gms/maps/model/CameraPosition.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/CameraPosition.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/CameraPosition.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/CameraPosition.java diff --git a/src/main/java/com/google/android/gms/maps/model/CircleOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/CircleOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/CircleOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/CircleOptions.java diff --git a/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/GroundOverlayOptions.java diff --git a/src/main/java/com/google/android/gms/maps/model/LatLng.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/LatLng.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java diff --git a/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/LatLngBounds.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java diff --git a/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/MarkerOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/MarkerOptions.java diff --git a/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/PolygonOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/PolygonOptions.java diff --git a/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/PolylineOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/PolylineOptions.java diff --git a/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaCamera.java diff --git a/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLink.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLink.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLink.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLink.java diff --git a/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaLocation.java diff --git a/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/StreetViewPanoramaOrientation.java diff --git a/src/main/java/com/google/android/gms/maps/model/Tile.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/Tile.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/Tile.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/Tile.java diff --git a/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/TileOverlayOptions.java diff --git a/src/main/java/com/google/android/gms/maps/model/TileProvider.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/TileProvider.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/TileProvider.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/TileProvider.java diff --git a/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/VisibleRegion.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/VisibleRegion.java diff --git a/src/main/java/com/google/android/gms/maps/model/package-info.java b/play-services-api/src/main/java/com/google/android/gms/maps/model/package-info.java similarity index 100% rename from src/main/java/com/google/android/gms/maps/model/package-info.java rename to play-services-api/src/main/java/com/google/android/gms/maps/model/package-info.java diff --git a/src/main/java/com/google/android/gms/people/model/AccountMetadata.java b/play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java similarity index 100% rename from src/main/java/com/google/android/gms/people/model/AccountMetadata.java rename to play-services-api/src/main/java/com/google/android/gms/people/model/AccountMetadata.java diff --git a/src/main/java/com/google/android/gms/plus/internal/PlusCommonExtras.java b/play-services-api/src/main/java/com/google/android/gms/plus/internal/PlusCommonExtras.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/internal/PlusCommonExtras.java rename to play-services-api/src/main/java/com/google/android/gms/plus/internal/PlusCommonExtras.java diff --git a/src/main/java/com/google/android/gms/plus/internal/PlusSession.java b/play-services-api/src/main/java/com/google/android/gms/plus/internal/PlusSession.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/internal/PlusSession.java rename to play-services-api/src/main/java/com/google/android/gms/plus/internal/PlusSession.java diff --git a/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java b/play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java rename to play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsRequest.java diff --git a/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java b/play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java rename to play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/CardsResponse.java diff --git a/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java b/play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java rename to play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesRequest.java diff --git a/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java b/play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java rename to play-services-api/src/main/java/com/google/android/gms/plus/internal/model/smart_profile/PeopleForProfilesResponse.java diff --git a/src/main/java/com/google/android/gms/plus/model/posts/Comment.java b/play-services-api/src/main/java/com/google/android/gms/plus/model/posts/Comment.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/model/posts/Comment.java rename to play-services-api/src/main/java/com/google/android/gms/plus/model/posts/Comment.java diff --git a/src/main/java/com/google/android/gms/plus/model/posts/Post.java b/play-services-api/src/main/java/com/google/android/gms/plus/model/posts/Post.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/model/posts/Post.java rename to play-services-api/src/main/java/com/google/android/gms/plus/model/posts/Post.java diff --git a/src/main/java/com/google/android/gms/plus/model/posts/Settings.java b/play-services-api/src/main/java/com/google/android/gms/plus/model/posts/Settings.java similarity index 100% rename from src/main/java/com/google/android/gms/plus/model/posts/Settings.java rename to play-services-api/src/main/java/com/google/android/gms/plus/model/posts/Settings.java diff --git a/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java b/play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java similarity index 100% rename from src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java rename to play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java diff --git a/src/main/java/com/google/android/gms/wearable/Node.java b/play-services-api/src/main/java/com/google/android/gms/wearable/Node.java similarity index 100% rename from src/main/java/com/google/android/gms/wearable/Node.java rename to play-services-api/src/main/java/com/google/android/gms/wearable/Node.java diff --git a/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java b/play-services-api/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java similarity index 100% rename from src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java rename to play-services-api/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java diff --git a/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java b/play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java similarity index 100% rename from src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java rename to play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java diff --git a/src/main/java/org/microg/gms/common/Constants.java b/play-services-api/src/main/java/org/microg/gms/common/Constants.java similarity index 100% rename from src/main/java/org/microg/gms/common/Constants.java rename to play-services-api/src/main/java/org/microg/gms/common/Constants.java diff --git a/src/main/java/org/microg/gms/common/PublicApi.java b/play-services-api/src/main/java/org/microg/gms/common/PublicApi.java similarity index 100% rename from src/main/java/org/microg/gms/common/PublicApi.java rename to play-services-api/src/main/java/org/microg/gms/common/PublicApi.java diff --git a/safe-parcel b/safe-parcel new file mode 120000 index 0000000..76875b7 --- /dev/null +++ b/safe-parcel @@ -0,0 +1 @@ +extern/SafeParcel/safe-parcel \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index 930a2c1..22f70d9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,2 @@ -rootProject.name = 'play-services-api' - -include ':SafeParcel' +include ':play-services-api' +include ':safe-parcel'