From 3d8fee7fabcd9e7c5c46f3f1f44da6cf4db89a70 Mon Sep 17 00:00:00 2001 From: Marvin W Date: Thu, 4 Aug 2016 21:45:00 +0200 Subject: [PATCH] First split of Api classes --- play-services-api/build.gradle | 5 +- .../android/gms/gcm/PendingCallback.java | 59 ------------------ play-services-cast-api/build.gradle | 55 +++++++++++++++++ .../src/main/AndroidManifest.xml | 24 ++++++++ .../android/gms/cast/ApplicationMetadata.java | 0 .../google/android/gms/cast/CastDevice.java | 0 .../gms/cast/CastMediaControlIntent.java | 0 .../android/gms/cast/CastStatusCodes.java | 0 .../android/gms/cast/LaunchOptions.java | 0 play-services-common-api/build.gradle | 60 +++++++++++++++++++ .../src/main/AndroidManifest.xml | 24 ++++++++ .../google/android/gms/common/api/Status.aidl | 0 .../android/gms/common/data/DataHolder.aidl | 0 .../common/internal/GetServiceRequest.aidl | 0 .../gms/common/internal/ICancelToken.aidl | 0 .../gms/common/internal/IGmsCallbacks.aidl | 0 .../common/internal/IGmsServiceBroker.aidl | 0 .../common/internal/ISignInButtonCreator.aidl | 0 .../internal/ValidateAccountRequest.aidl | 0 .../common/server/FavaDiagnosticsEntity.aidl | 0 .../android/gms/dynamic/IObjectWrapper.aidl | 0 .../com/google/android/gms/common/Scopes.java | 0 .../android/gms/common/api/AccountInfo.java | 0 .../gms/common/api/CommonStatusCodes.java | 0 .../google/android/gms/common/api/Result.java | 0 .../google/android/gms/common/api/Scope.java | 0 .../google/android/gms/common/api/Status.java | 0 .../android/gms/common/data/DataHolder.java | 0 .../android/gms/common/data/Freezable.java | 0 .../android/gms/common/images/WebImage.java | 0 .../gms/common/internal/BinderWrapper.java | 0 .../common/internal/GetServiceRequest.java | 0 .../internal/ValidateAccountRequest.java | 0 .../common/server/FavaDiagnosticsEntity.java | 0 .../android/gms/dynamic/ObjectWrapper.java | 0 .../org/microg/gms/auth/AuthConstants.java | 0 .../java/org/microg/gms/common/Constants.java | 0 .../org/microg/gms/common/GmsService.java | 0 .../java/org/microg/gms/common/PublicApi.java | 0 play-services-location-api/build.gradle | 55 +++++++++++++++++ .../src/main/AndroidManifest.xml | 24 ++++++++ .../location/ActivityRecognitionResult.aidl | 0 .../google/android/gms/location/Geofence.aidl | 0 .../gms/location/GeofencingRequest.aidl | 0 .../android/gms/location/GestureRequest.aidl | 0 .../gms/location/ILocationCallback.aidl | 0 .../gms/location/ILocationListener.aidl | 0 .../gms/location/LocationAvailability.aidl | 0 .../android/gms/location/LocationRequest.aidl | 0 .../android/gms/location/LocationResult.aidl | 0 .../gms/location/LocationSettingsRequest.aidl | 0 .../gms/location/LocationSettingsResult.aidl | 0 .../android/gms/location/LocationStatus.aidl | 0 .../internal/FusedLocationProviderResult.aidl | 0 .../IFusedLocationProviderCallback.aidl | 0 .../internal/IGeofencerCallbacks.aidl | 0 .../IGoogleLocationManagerService.aidl | 0 .../location/internal/ISettingsCallbacks.aidl | 0 .../internal/LocationRequestInternal.aidl | 0 .../internal/LocationRequestUpdateData.aidl | 0 .../location/places/AutocompleteFilter.aidl | 0 .../location/places/NearbyAlertRequest.aidl | 0 .../gms/location/places/PlaceFilter.aidl | 0 .../gms/location/places/PlaceReport.aidl | 0 .../gms/location/places/PlaceRequest.aidl | 0 .../gms/location/places/UserAddedPlace.aidl | 0 .../gms/location/places/UserDataType.aidl | 0 .../places/internal/IPlacesCallbacks.aidl | 0 .../places/internal/PlacesParams.aidl | 0 .../location/reporting/ReportingState.aidl | 0 .../gms/location/reporting/UploadRequest.aidl | 0 .../reporting/UploadRequestResult.aidl | 0 .../reporting/internal/IReportingService.aidl | 0 .../google/android/gms/maps/model/LatLng.aidl | 0 .../android/gms/maps/model/LatLngBounds.aidl | 0 .../location/ActivityRecognitionResult.java | 0 .../google/android/gms/location/Geofence.java | 0 .../gms/location/GeofencingRequest.java | 0 .../android/gms/location/GestureRequest.java | 0 .../gms/location/LocationAvailability.java | 0 .../android/gms/location/LocationRequest.java | 0 .../android/gms/location/LocationResult.java | 0 .../gms/location/LocationSettingsRequest.java | 0 .../gms/location/LocationSettingsResult.java | 0 .../gms/location/LocationSettingsStates.java | 0 .../android/gms/location/LocationStatus.java | 0 .../gms/location/internal/ClientIdentity.java | 0 .../internal/FusedLocationProviderResult.java | 0 .../internal/LocationRequestInternal.java | 0 .../internal/LocationRequestUpdateData.java | 0 .../location/places/AutocompleteFilter.java | 0 .../location/places/NearbyAlertRequest.java | 0 .../android/gms/location/places/Place.java | 0 .../gms/location/places/PlaceFilter.java | 0 .../gms/location/places/PlaceReport.java | 0 .../gms/location/places/PlaceRequest.java | 0 .../gms/location/places/UserAddedPlace.java | 0 .../gms/location/places/UserDataType.java | 0 .../location/places/internal/PlaceImpl.java | 0 .../places/internal/PlacesParams.java | 0 .../location/reporting/ReportingState.java | 0 .../gms/location/reporting/UploadRequest.java | 0 .../reporting/UploadRequestResult.java | 0 .../google/android/gms/maps/model/LatLng.java | 0 .../android/gms/maps/model/LatLngBounds.java | 0 .../gms/location/LocationConstants.java | 0 play-services-wearable-api/build.gradle | 55 +++++++++++++++++ .../src/main/AndroidManifest.xml | 24 ++++++++ .../google/android/gms/wearable/Asset.aidl | 0 .../gms/wearable/ConnectionConfiguration.aidl | 0 .../wearable/internal/AddListenerRequest.aidl | 0 .../internal/AmsEntityUpdateParcelable.aidl | 0 .../internal/AncsNotificationParcelable.aidl | 0 .../internal/CapabilityInfoParcelable.aidl | 0 .../internal/ChannelEventParcelable.aidl | 0 .../internal/DeleteDataItemsResponse.aidl | 0 .../internal/GetCloudSyncSettingResponse.aidl | 0 .../wearable/internal/GetConfigResponse.aidl | 0 .../wearable/internal/GetConfigsResponse.aidl | 0 .../internal/GetConnectedNodesResponse.aidl | 0 .../internal/GetDataItemResponse.aidl | 0 .../internal/GetFdForAssetResponse.aidl | 0 .../internal/GetLocalNodeResponse.aidl | 0 .../internal/IChannelStreamCallbacks.aidl | 0 .../wearable/internal/IWearableCallbacks.aidl | 0 .../wearable/internal/IWearableListener.aidl | 0 .../wearable/internal/IWearableService.aidl | 0 .../internal/MessageEventParcelable.aidl | 0 .../gms/wearable/internal/NodeParcelable.aidl | 0 .../gms/wearable/internal/PutDataRequest.aidl | 0 .../wearable/internal/PutDataResponse.aidl | 0 .../internal/RemoveListenerRequest.aidl | 0 .../internal/SendMessageResponse.aidl | 0 .../internal/StorageInfoResponse.aidl | 0 .../google/android/gms/wearable/Asset.java | 0 .../gms/wearable/ConnectionConfiguration.java | 0 .../google/android/gms/wearable/DataItem.java | 0 .../android/gms/wearable/DataItemAsset.java | 0 .../android/gms/wearable/MessageEvent.java | 0 .../com/google/android/gms/wearable/Node.java | 0 .../gms/wearable/WearableStatusCodes.java | 0 .../wearable/internal/AddListenerRequest.java | 0 .../internal/AmsEntityUpdateParcelable.java | 0 .../internal/AncsNotificationParcelable.java | 0 .../internal/CapabilityInfoParcelable.java | 0 .../internal/ChannelEventParcelable.java | 0 .../internal/DataItemAssetParcelable.java | 0 .../wearable/internal/DataItemParcelable.java | 0 .../internal/DeleteDataItemsResponse.java | 0 .../internal/GetCloudSyncSettingResponse.java | 0 .../wearable/internal/GetConfigResponse.java | 0 .../wearable/internal/GetConfigsResponse.java | 0 .../internal/GetConnectedNodesResponse.java | 0 .../internal/GetDataItemResponse.java | 0 .../internal/GetFdForAssetResponse.java | 0 .../internal/GetLocalNodeResponse.java | 0 .../internal/MessageEventParcelable.java | 0 .../gms/wearable/internal/NodeParcelable.java | 0 .../gms/wearable/internal/PutDataRequest.java | 0 .../wearable/internal/PutDataResponse.java | 0 .../internal/RemoveListenerRequest.java | 0 .../internal/SendMessageResponse.java | 0 .../internal/StorageInfoResponse.java | 0 settings.gradle | 4 ++ 164 files changed, 329 insertions(+), 60 deletions(-) delete mode 100644 play-services-api/src/main/java/com/google/android/gms/gcm/PendingCallback.java create mode 100644 play-services-cast-api/build.gradle create mode 100644 play-services-cast-api/src/main/AndroidManifest.xml rename {play-services-api => play-services-cast-api}/src/main/java/com/google/android/gms/cast/ApplicationMetadata.java (100%) rename {play-services-api => play-services-cast-api}/src/main/java/com/google/android/gms/cast/CastDevice.java (100%) rename {play-services-api => play-services-cast-api}/src/main/java/com/google/android/gms/cast/CastMediaControlIntent.java (100%) rename {play-services-api => play-services-cast-api}/src/main/java/com/google/android/gms/cast/CastStatusCodes.java (100%) rename {play-services-api => play-services-cast-api}/src/main/java/com/google/android/gms/cast/LaunchOptions.java (100%) create mode 100644 play-services-common-api/build.gradle create mode 100644 play-services-common-api/src/main/AndroidManifest.xml rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/api/Status.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/Scopes.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/api/AccountInfo.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/api/Result.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/api/Scope.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/api/Status.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/data/DataHolder.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/data/Freezable.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/images/WebImage.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/internal/BinderWrapper.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/org/microg/gms/auth/AuthConstants.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/org/microg/gms/common/Constants.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/org/microg/gms/common/GmsService.java (100%) rename {play-services-api => play-services-common-api}/src/main/java/org/microg/gms/common/PublicApi.java (100%) create mode 100644 play-services-location-api/build.gradle create mode 100644 play-services-location-api/src/main/AndroidManifest.xml rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/ActivityRecognitionResult.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/Geofence.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/GestureRequest.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/ILocationCallback.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/LocationAvailability.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/LocationResult.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/LocationSettingsRequest.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/LocationSettingsResult.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/internal/ISettingsCallbacks.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/internal/LocationRequestUpdateData.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/reporting/UploadRequest.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/reporting/UploadRequestResult.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/ActivityRecognitionResult.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/Geofence.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/GeofencingRequest.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/GestureRequest.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/LocationAvailability.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/LocationRequest.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/LocationResult.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/LocationSettingsResult.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/LocationSettingsStates.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/LocationStatus.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/Place.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/PlaceFilter.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/PlaceReport.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/PlaceRequest.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/UserDataType.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/internal/PlaceImpl.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/reporting/ReportingState.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/reporting/UploadRequest.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/location/reporting/UploadRequestResult.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/maps/model/LatLng.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java (100%) rename {play-services-api => play-services-location-api}/src/main/java/org/microg/gms/location/LocationConstants.java (100%) create mode 100644 play-services-wearable-api/build.gradle create mode 100644 play-services-wearable-api/src/main/AndroidManifest.xml rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/Asset.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/AddListenerRequest.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/AncsNotificationParcelable.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/ChannelEventParcelable.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigsResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/GetDataItemResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/GetFdForAssetResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/GetLocalNodeResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/IChannelStreamCallbacks.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/MessageEventParcelable.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/NodeParcelable.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/PutDataRequest.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/PutDataResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/RemoveListenerRequest.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/SendMessageResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/aidl/com/google/android/gms/wearable/internal/StorageInfoResponse.aidl (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/Asset.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/DataItem.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/DataItemAsset.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/MessageEvent.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/Node.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/AddListenerRequest.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/AncsNotificationParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/ChannelEventParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/GetConfigResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/GetConfigsResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/GetDataItemResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/GetFdForAssetResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/GetLocalNodeResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/MessageEventParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/PutDataResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/RemoveListenerRequest.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/SendMessageResponse.java (100%) rename {play-services-api => play-services-wearable-api}/src/main/java/com/google/android/gms/wearable/internal/StorageInfoResponse.java (100%) diff --git a/play-services-api/build.gradle b/play-services-api/build.gradle index b0b8ad9d..5b5dd33e 100644 --- a/play-services-api/build.gradle +++ b/play-services-api/build.gradle @@ -51,5 +51,8 @@ android { } dependencies { - compile project(':safe-parcel') + compile project(':play-services-cast-api') + compile project(':play-services-common-api') + compile project(':play-services-location-api') + compile project(':play-services-wearable-api') } diff --git a/play-services-api/src/main/java/com/google/android/gms/gcm/PendingCallback.java b/play-services-api/src/main/java/com/google/android/gms/gcm/PendingCallback.java deleted file mode 100644 index 6eed3e3d..00000000 --- a/play-services-api/src/main/java/com/google/android/gms/gcm/PendingCallback.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright 2013-2016 microG Project Team - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.android.gms.gcm; - -import android.os.IBinder; -import android.os.Parcel; -import android.os.Parcelable; - -public class PendingCallback implements Parcelable { - private final IBinder binder; - - public PendingCallback(IBinder binder) { - this.binder = binder; - } - - private PendingCallback(Parcel in) { - this.binder = in.readStrongBinder(); - } - - public IBinder getBinder() { - return binder; - } - - @Override - public int describeContents() { - return 0; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - dest.writeStrongBinder(binder); - } - - public static final Creator CREATOR = new Creator() { - @Override - public PendingCallback createFromParcel(Parcel source) { - return new PendingCallback(source); - } - - @Override - public PendingCallback[] newArray(int size) { - return new PendingCallback[size]; - } - }; -} diff --git a/play-services-cast-api/build.gradle b/play-services-cast-api/build.gradle new file mode 100644 index 00000000..47f513a0 --- /dev/null +++ b/play-services-cast-api/build.gradle @@ -0,0 +1,55 @@ +/* + * Copyright 2013-2015 microG Project Team + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.library' + +String getMyVersionName() { + def stdout = new ByteArrayOutputStream() + if (rootProject.file("gradlew").exists()) + exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout } + else // automatic build system, don't tag dirty + exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout } + return stdout.toString().trim().substring(1) +} + +group = 'org.microg' +version = getMyVersionName() + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + defaultConfig { + versionName getMyVersionName() + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_6 + } +} + +dependencies { + compile project(':play-services-common-api') +} diff --git a/play-services-cast-api/src/main/AndroidManifest.xml b/play-services-cast-api/src/main/AndroidManifest.xml new file mode 100644 index 00000000..1aca1c4a --- /dev/null +++ b/play-services-cast-api/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/play-services-api/src/main/java/com/google/android/gms/cast/ApplicationMetadata.java b/play-services-cast-api/src/main/java/com/google/android/gms/cast/ApplicationMetadata.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/cast/ApplicationMetadata.java rename to play-services-cast-api/src/main/java/com/google/android/gms/cast/ApplicationMetadata.java diff --git a/play-services-api/src/main/java/com/google/android/gms/cast/CastDevice.java b/play-services-cast-api/src/main/java/com/google/android/gms/cast/CastDevice.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/cast/CastDevice.java rename to play-services-cast-api/src/main/java/com/google/android/gms/cast/CastDevice.java diff --git a/play-services-api/src/main/java/com/google/android/gms/cast/CastMediaControlIntent.java b/play-services-cast-api/src/main/java/com/google/android/gms/cast/CastMediaControlIntent.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/cast/CastMediaControlIntent.java rename to play-services-cast-api/src/main/java/com/google/android/gms/cast/CastMediaControlIntent.java diff --git a/play-services-api/src/main/java/com/google/android/gms/cast/CastStatusCodes.java b/play-services-cast-api/src/main/java/com/google/android/gms/cast/CastStatusCodes.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/cast/CastStatusCodes.java rename to play-services-cast-api/src/main/java/com/google/android/gms/cast/CastStatusCodes.java diff --git a/play-services-api/src/main/java/com/google/android/gms/cast/LaunchOptions.java b/play-services-cast-api/src/main/java/com/google/android/gms/cast/LaunchOptions.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/cast/LaunchOptions.java rename to play-services-cast-api/src/main/java/com/google/android/gms/cast/LaunchOptions.java diff --git a/play-services-common-api/build.gradle b/play-services-common-api/build.gradle new file mode 100644 index 00000000..f43af0a4 --- /dev/null +++ b/play-services-common-api/build.gradle @@ -0,0 +1,60 @@ +/* + * Copyright 2013-2015 microG Project Team + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.library' + +String getMyVersionName() { + def stdout = new ByteArrayOutputStream() + if (rootProject.file("gradlew").exists()) + exec { + commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout + } + else // automatic build system, don't tag dirty + exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout } + return stdout.toString().trim().substring(1) +} + +group = 'org.microg' +version = getMyVersionName() + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + aidlPackageWhiteList "com/google/android/gms/common/internal/ICancelToken.aidl" + aidlPackageWhiteList "com/google/android/gms/dynamic/IObjectWrapper.aidl" + + defaultConfig { + versionName getMyVersionName() + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_6 + } +} + +dependencies { + compile project(':safe-parcel') +} diff --git a/play-services-common-api/src/main/AndroidManifest.xml b/play-services-common-api/src/main/AndroidManifest.xml new file mode 100644 index 00000000..03679b28 --- /dev/null +++ b/play-services-common-api/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/api/Status.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/api/Status.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/api/Status.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/api/Status.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/data/DataHolder.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/GetServiceRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/ICancelToken.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/IGmsCallbacks.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/IGmsServiceBroker.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/ISignInButtonCreator.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/internal/ValidateAccountRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/common/server/FavaDiagnosticsEntity.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl b/play-services-common-api/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl rename to play-services-common-api/src/main/aidl/com/google/android/gms/dynamic/IObjectWrapper.aidl diff --git a/play-services-api/src/main/java/com/google/android/gms/common/Scopes.java b/play-services-common-api/src/main/java/com/google/android/gms/common/Scopes.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/Scopes.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/Scopes.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java b/play-services-common-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/api/AccountInfo.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java b/play-services-common-api/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/api/CommonStatusCodes.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/Result.java b/play-services-common-api/src/main/java/com/google/android/gms/common/api/Result.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/api/Result.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/api/Result.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java b/play-services-common-api/src/main/java/com/google/android/gms/common/api/Scope.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/api/Scope.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/api/Scope.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/api/Status.java b/play-services-common-api/src/main/java/com/google/android/gms/common/api/Status.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/api/Status.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/api/Status.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java b/play-services-common-api/src/main/java/com/google/android/gms/common/data/DataHolder.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/data/DataHolder.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/data/DataHolder.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/data/Freezable.java b/play-services-common-api/src/main/java/com/google/android/gms/common/data/Freezable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/data/Freezable.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/data/Freezable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/images/WebImage.java b/play-services-common-api/src/main/java/com/google/android/gms/common/images/WebImage.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/images/WebImage.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/images/WebImage.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/internal/BinderWrapper.java b/play-services-common-api/src/main/java/com/google/android/gms/common/internal/BinderWrapper.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/internal/BinderWrapper.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/internal/BinderWrapper.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java b/play-services-common-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/internal/GetServiceRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java b/play-services-common-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/internal/ValidateAccountRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java b/play-services-common-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java rename to play-services-common-api/src/main/java/com/google/android/gms/common/server/FavaDiagnosticsEntity.java diff --git a/play-services-api/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java b/play-services-common-api/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java rename to play-services-common-api/src/main/java/com/google/android/gms/dynamic/ObjectWrapper.java diff --git a/play-services-api/src/main/java/org/microg/gms/auth/AuthConstants.java b/play-services-common-api/src/main/java/org/microg/gms/auth/AuthConstants.java similarity index 100% rename from play-services-api/src/main/java/org/microg/gms/auth/AuthConstants.java rename to play-services-common-api/src/main/java/org/microg/gms/auth/AuthConstants.java diff --git a/play-services-api/src/main/java/org/microg/gms/common/Constants.java b/play-services-common-api/src/main/java/org/microg/gms/common/Constants.java similarity index 100% rename from play-services-api/src/main/java/org/microg/gms/common/Constants.java rename to play-services-common-api/src/main/java/org/microg/gms/common/Constants.java diff --git a/play-services-api/src/main/java/org/microg/gms/common/GmsService.java b/play-services-common-api/src/main/java/org/microg/gms/common/GmsService.java similarity index 100% rename from play-services-api/src/main/java/org/microg/gms/common/GmsService.java rename to play-services-common-api/src/main/java/org/microg/gms/common/GmsService.java diff --git a/play-services-api/src/main/java/org/microg/gms/common/PublicApi.java b/play-services-common-api/src/main/java/org/microg/gms/common/PublicApi.java similarity index 100% rename from play-services-api/src/main/java/org/microg/gms/common/PublicApi.java rename to play-services-common-api/src/main/java/org/microg/gms/common/PublicApi.java diff --git a/play-services-location-api/build.gradle b/play-services-location-api/build.gradle new file mode 100644 index 00000000..47f513a0 --- /dev/null +++ b/play-services-location-api/build.gradle @@ -0,0 +1,55 @@ +/* + * Copyright 2013-2015 microG Project Team + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.library' + +String getMyVersionName() { + def stdout = new ByteArrayOutputStream() + if (rootProject.file("gradlew").exists()) + exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout } + else // automatic build system, don't tag dirty + exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout } + return stdout.toString().trim().substring(1) +} + +group = 'org.microg' +version = getMyVersionName() + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + defaultConfig { + versionName getMyVersionName() + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_6 + } +} + +dependencies { + compile project(':play-services-common-api') +} diff --git a/play-services-location-api/src/main/AndroidManifest.xml b/play-services-location-api/src/main/AndroidManifest.xml new file mode 100644 index 00000000..2439e26f --- /dev/null +++ b/play-services-location-api/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/ActivityRecognitionResult.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/ActivityRecognitionResult.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/ActivityRecognitionResult.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/ActivityRecognitionResult.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/Geofence.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/Geofence.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/Geofence.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/Geofence.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/GeofencingRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/GestureRequest.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/GestureRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/GestureRequest.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/GestureRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/ILocationCallback.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/ILocationCallback.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/ILocationCallback.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/ILocationCallback.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/ILocationListener.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/LocationAvailability.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationAvailability.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/LocationAvailability.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationAvailability.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/LocationResult.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationResult.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/LocationResult.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationResult.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/LocationSettingsRequest.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationSettingsRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/LocationSettingsRequest.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationSettingsRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/LocationSettingsResult.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationSettingsResult.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/LocationSettingsResult.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationSettingsResult.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/LocationStatus.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/FusedLocationProviderResult.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IFusedLocationProviderCallback.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGeofencerCallbacks.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/IGoogleLocationManagerService.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/ISettingsCallbacks.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/ISettingsCallbacks.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/internal/ISettingsCallbacks.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/ISettingsCallbacks.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestInternal.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestUpdateData.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestUpdateData.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestUpdateData.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/internal/LocationRequestUpdateData.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/AutocompleteFilter.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/NearbyAlertRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/PlaceFilter.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/PlaceReport.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/PlaceRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/UserAddedPlace.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/UserDataType.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/internal/IPlacesCallbacks.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/places/internal/PlacesParams.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/ReportingState.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequest.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequest.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequestResult.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequestResult.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequestResult.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/UploadRequestResult.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/location/reporting/internal/IReportingService.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/maps/model/LatLng.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl b/play-services-location-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl rename to play-services-location-api/src/main/aidl/com/google/android/gms/maps/model/LatLngBounds.aidl diff --git a/play-services-api/src/main/java/com/google/android/gms/location/ActivityRecognitionResult.java b/play-services-location-api/src/main/java/com/google/android/gms/location/ActivityRecognitionResult.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/ActivityRecognitionResult.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/ActivityRecognitionResult.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/Geofence.java b/play-services-location-api/src/main/java/com/google/android/gms/location/Geofence.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/Geofence.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/Geofence.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/GeofencingRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/GestureRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/GestureRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/GestureRequest.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/GestureRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationAvailability.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationAvailability.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/LocationAvailability.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/LocationAvailability.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/LocationRequest.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/LocationRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationResult.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationResult.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/LocationResult.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/LocationResult.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationSettingsResult.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsResult.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/LocationSettingsResult.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsResult.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationSettingsStates.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsStates.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/LocationSettingsStates.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/LocationSettingsStates.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java b/play-services-location-api/src/main/java/com/google/android/gms/location/LocationStatus.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/LocationStatus.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/LocationStatus.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/internal/ClientIdentity.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/internal/FusedLocationProviderResult.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestInternal.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java b/play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/internal/LocationRequestUpdateData.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/AutocompleteFilter.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/NearbyAlertRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/Place.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/Place.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/Place.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/Place.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/PlaceFilter.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/PlaceReport.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/PlaceRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/UserAddedPlace.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/UserDataType.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/UserDataType.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/UserDataType.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlaceImpl.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/internal/PlaceImpl.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlaceImpl.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/internal/PlaceImpl.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java b/play-services-location-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/places/internal/PlacesParams.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java b/play-services-location-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/reporting/ReportingState.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/reporting/UploadRequest.java b/play-services-location-api/src/main/java/com/google/android/gms/location/reporting/UploadRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/reporting/UploadRequest.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/reporting/UploadRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/location/reporting/UploadRequestResult.java b/play-services-location-api/src/main/java/com/google/android/gms/location/reporting/UploadRequestResult.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/location/reporting/UploadRequestResult.java rename to play-services-location-api/src/main/java/com/google/android/gms/location/reporting/UploadRequestResult.java diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java b/play-services-location-api/src/main/java/com/google/android/gms/maps/model/LatLng.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/maps/model/LatLng.java rename to play-services-location-api/src/main/java/com/google/android/gms/maps/model/LatLng.java diff --git a/play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java b/play-services-location-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java rename to play-services-location-api/src/main/java/com/google/android/gms/maps/model/LatLngBounds.java diff --git a/play-services-api/src/main/java/org/microg/gms/location/LocationConstants.java b/play-services-location-api/src/main/java/org/microg/gms/location/LocationConstants.java similarity index 100% rename from play-services-api/src/main/java/org/microg/gms/location/LocationConstants.java rename to play-services-location-api/src/main/java/org/microg/gms/location/LocationConstants.java diff --git a/play-services-wearable-api/build.gradle b/play-services-wearable-api/build.gradle new file mode 100644 index 00000000..47f513a0 --- /dev/null +++ b/play-services-wearable-api/build.gradle @@ -0,0 +1,55 @@ +/* + * Copyright 2013-2015 microG Project Team + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.1.2' + } +} + +apply plugin: 'com.android.library' + +String getMyVersionName() { + def stdout = new ByteArrayOutputStream() + if (rootProject.file("gradlew").exists()) + exec { commandLine 'git', 'describe', '--tags', '--always', '--dirty'; standardOutput = stdout } + else // automatic build system, don't tag dirty + exec { commandLine 'git', 'describe', '--tags', '--always'; standardOutput = stdout } + return stdout.toString().trim().substring(1) +} + +group = 'org.microg' +version = getMyVersionName() + +android { + compileSdkVersion 23 + buildToolsVersion "23.0.3" + + defaultConfig { + versionName getMyVersionName() + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_6 + } +} + +dependencies { + compile project(':play-services-common-api') +} diff --git a/play-services-wearable-api/src/main/AndroidManifest.xml b/play-services-wearable-api/src/main/AndroidManifest.xml new file mode 100644 index 00000000..9ab8979d --- /dev/null +++ b/play-services-wearable-api/src/main/AndroidManifest.xml @@ -0,0 +1,24 @@ + + + + + + + + + diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/Asset.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/Asset.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/Asset.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/Asset.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/ConnectionConfiguration.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/AddListenerRequest.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/AddListenerRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/AddListenerRequest.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/AddListenerRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/AncsNotificationParcelable.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/AncsNotificationParcelable.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/AncsNotificationParcelable.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/AncsNotificationParcelable.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/ChannelEventParcelable.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/ChannelEventParcelable.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/ChannelEventParcelable.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/ChannelEventParcelable.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigsResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigsResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigsResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConfigsResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetDataItemResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetDataItemResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetDataItemResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetDataItemResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetFdForAssetResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetFdForAssetResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetFdForAssetResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetFdForAssetResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetLocalNodeResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetLocalNodeResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/GetLocalNodeResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/GetLocalNodeResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IChannelStreamCallbacks.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IChannelStreamCallbacks.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IChannelStreamCallbacks.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IChannelStreamCallbacks.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableCallbacks.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableListener.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/IWearableService.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/MessageEventParcelable.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/MessageEventParcelable.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/MessageEventParcelable.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/MessageEventParcelable.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/NodeParcelable.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/NodeParcelable.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/NodeParcelable.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/NodeParcelable.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataRequest.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataRequest.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/PutDataResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/RemoveListenerRequest.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/RemoveListenerRequest.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/RemoveListenerRequest.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/RemoveListenerRequest.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/SendMessageResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/SendMessageResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/SendMessageResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/SendMessageResponse.aidl diff --git a/play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/StorageInfoResponse.aidl b/play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/StorageInfoResponse.aidl similarity index 100% rename from play-services-api/src/main/aidl/com/google/android/gms/wearable/internal/StorageInfoResponse.aidl rename to play-services-wearable-api/src/main/aidl/com/google/android/gms/wearable/internal/StorageInfoResponse.aidl diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/Asset.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/Asset.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/Asset.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/Asset.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/ConnectionConfiguration.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/DataItem.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/DataItem.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/DataItem.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/DataItem.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/DataItemAsset.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/DataItemAsset.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/DataItemAsset.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/DataItemAsset.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/MessageEvent.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/MessageEvent.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/MessageEvent.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/MessageEvent.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/Node.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/Node.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/Node.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/Node.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/WearableStatusCodes.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/AddListenerRequest.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/AddListenerRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/AddListenerRequest.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/AddListenerRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/AmsEntityUpdateParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/AncsNotificationParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/AncsNotificationParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/AncsNotificationParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/AncsNotificationParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/CapabilityInfoParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/ChannelEventParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/ChannelEventParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/ChannelEventParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/ChannelEventParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/DataItemAssetParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/DataItemParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/DeleteDataItemsResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetCloudSyncSettingResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigsResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigsResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigsResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetConfigsResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetConnectedNodesResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetDataItemResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetDataItemResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetDataItemResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetDataItemResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetFdForAssetResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetFdForAssetResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetFdForAssetResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetFdForAssetResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetLocalNodeResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetLocalNodeResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/GetLocalNodeResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/GetLocalNodeResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/MessageEventParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/MessageEventParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/MessageEventParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/MessageEventParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/NodeParcelable.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/PutDataRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/PutDataResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/PutDataResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/PutDataResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/RemoveListenerRequest.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/RemoveListenerRequest.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/RemoveListenerRequest.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/RemoveListenerRequest.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/SendMessageResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/SendMessageResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/SendMessageResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/SendMessageResponse.java diff --git a/play-services-api/src/main/java/com/google/android/gms/wearable/internal/StorageInfoResponse.java b/play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/StorageInfoResponse.java similarity index 100% rename from play-services-api/src/main/java/com/google/android/gms/wearable/internal/StorageInfoResponse.java rename to play-services-wearable-api/src/main/java/com/google/android/gms/wearable/internal/StorageInfoResponse.java diff --git a/settings.gradle b/settings.gradle index 22f70d94..7a2ffd82 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,6 @@ include ':play-services-api' +include ':play-services-cast-api' +include ':play-services-common-api' +include ':play-services-location-api' +include ':play-services-wearable-api' include ':safe-parcel'