diff --git a/.gitmodules b/.gitmodules index 272c45cf..99cf84da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,6 @@ -[submodule "UnifiedNlpApi"] - path = UnifiedNlpApi - url = https://github.com/microg/android_external_UnifiedNlpApi.git [submodule "UnifiedNlpLib"] path = UnifiedNlpLib url = https://github.com/microg/android_packages_apps_UnifiedNlp.git -[submodule "GmsApi"] - path = GmsApi +[submodule "play-services-api"] + path = play-services-api url = https://github.com/microg/android_external_GmsApi.git -[submodule "SafeParcel"] - path = SafeParcel - url = https://github.com/microg/android_external_SafeParcel.git diff --git a/Android.mk b/Android.mk index 0d6ad646..d5ff081f 100644 --- a/Android.mk +++ b/Android.mk @@ -20,8 +20,8 @@ unified_dir := ../UnifiedNlp appcompat_dir := ../../../prebuilts/sdk/current/support/v7/appcompat res_dir := res $(unified_dir)/res $(appcompat_dir)/res -LOCAL_SRC_FILES := $(call all-java-files-under, src) \ - $(call all-Iaidl-files-under, src) \ +LOCAL_SRC_FILES := $(call all-java-files-under, play-services-core/src/main/java) \ + $(call all-java-files-under, play-services-core/src/main/protos-java) \ $(call all-java-files-under, $(unified_dir)/src) \ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir)) diff --git a/GmsApi b/GmsApi deleted file mode 160000 index 1510aa1b..00000000 --- a/GmsApi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1510aa1b0adeeed9dbe591b25ad75b015f968d82 diff --git a/SafeParcel b/SafeParcel deleted file mode 160000 index 462316b1..00000000 --- a/SafeParcel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 462316b18e2620bd5c0cb843abd67671d941300d diff --git a/SafeParcel b/SafeParcel new file mode 120000 index 00000000..18f7aa75 --- /dev/null +++ b/SafeParcel @@ -0,0 +1 @@ +play-services-api/SafeParcel/ \ No newline at end of file diff --git a/UnifiedNlpApi b/UnifiedNlpApi deleted file mode 160000 index 06d11323..00000000 --- a/UnifiedNlpApi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 06d1132344b4600ae00bda63d4da0acff7de42f0 diff --git a/UnifiedNlpApi b/UnifiedNlpApi new file mode 120000 index 00000000..bf1c06f8 --- /dev/null +++ b/UnifiedNlpApi @@ -0,0 +1 @@ +UnifiedNlpLib/UnifiedNlpApi \ No newline at end of file diff --git a/play-services-api b/play-services-api new file mode 160000 index 00000000..dbae4add --- /dev/null +++ b/play-services-api @@ -0,0 +1 @@ +Subproject commit dbae4add94505fb0765ca9a18896848df6ae6ae4 diff --git a/build.gradle b/play-services-core/build.gradle similarity index 86% rename from build.gradle rename to play-services-core/build.gradle index 7575175d..df1bcc1d 100644 --- a/build.gradle +++ b/play-services-core/build.gradle @@ -28,7 +28,7 @@ apply plugin: 'com.android.application' repositories { mavenCentral() flatDir { - dirs 'libs' + dirs '../libs' } } @@ -39,7 +39,7 @@ dependencies { compile 'de.hdodenhof:circleimageview:1.2.1' compile 'com.squareup.wire:wire-runtime:1.6.1' - compile project(':GmsApi') + compile project(':play-services-api') compile project(':UnifiedNlpLib') // vtm from ./libs @@ -59,15 +59,10 @@ dependencies { android { compileSdkVersion 21 buildToolsVersion "21.1.2" - lintOptions.abortOnError false sourceSets { main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src', 'protos-src'] - aidl.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] + java.srcDirs += 'src/main/protos-java' } } } diff --git a/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to play-services-core/src/main/AndroidManifest.xml diff --git a/src/com/google/android/gms/ads/AdActivity.java b/play-services-core/src/main/java/com/google/android/gms/ads/AdActivity.java similarity index 100% rename from src/com/google/android/gms/ads/AdActivity.java rename to play-services-core/src/main/java/com/google/android/gms/ads/AdActivity.java diff --git a/src/com/google/android/gms/ads/AdManagerCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/ads/AdManagerCreatorImpl.java similarity index 100% rename from src/com/google/android/gms/ads/AdManagerCreatorImpl.java rename to play-services-core/src/main/java/com/google/android/gms/ads/AdManagerCreatorImpl.java diff --git a/src/com/google/android/gms/analytics/service/AnalyticsService.java b/play-services-core/src/main/java/com/google/android/gms/analytics/service/AnalyticsService.java similarity index 100% rename from src/com/google/android/gms/analytics/service/AnalyticsService.java rename to play-services-core/src/main/java/com/google/android/gms/analytics/service/AnalyticsService.java diff --git a/src/com/google/android/gms/auth/GetToken.java b/play-services-core/src/main/java/com/google/android/gms/auth/GetToken.java similarity index 100% rename from src/com/google/android/gms/auth/GetToken.java rename to play-services-core/src/main/java/com/google/android/gms/auth/GetToken.java diff --git a/src/com/google/android/gms/auth/TokenActivity.java b/play-services-core/src/main/java/com/google/android/gms/auth/TokenActivity.java similarity index 100% rename from src/com/google/android/gms/auth/TokenActivity.java rename to play-services-core/src/main/java/com/google/android/gms/auth/TokenActivity.java diff --git a/src/com/google/android/gms/common/security/ProviderInstallerImpl.java b/play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java similarity index 100% rename from src/com/google/android/gms/common/security/ProviderInstallerImpl.java rename to play-services-core/src/main/java/com/google/android/gms/common/security/ProviderInstallerImpl.java diff --git a/src/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java similarity index 100% rename from src/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java rename to play-services-core/src/main/java/com/google/android/gms/common/ui/SignInButtonCreatorImpl.java diff --git a/src/com/google/android/gms/maps/internal/CreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java similarity index 100% rename from src/com/google/android/gms/maps/internal/CreatorImpl.java rename to play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java diff --git a/src/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java similarity index 100% rename from src/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java rename to play-services-core/src/main/java/com/google/android/gms/plus/plusone/PlusOneButtonCreatorImpl.java diff --git a/src/com/google/android/gms/recovery/RecoveryService.java b/play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java similarity index 100% rename from src/com/google/android/gms/recovery/RecoveryService.java rename to play-services-core/src/main/java/com/google/android/gms/recovery/RecoveryService.java diff --git a/src/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java b/play-services-core/src/main/java/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java similarity index 100% rename from src/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java rename to play-services-core/src/main/java/com/google/android/gms/wallet/dynamite/WalletDynamiteCreatorImpl.java diff --git a/src/org/microg/gms/AbstractGmsServiceBroker.java b/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java similarity index 100% rename from src/org/microg/gms/AbstractGmsServiceBroker.java rename to play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java diff --git a/src/org/microg/gms/auth/AskPermissionActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java similarity index 100% rename from src/org/microg/gms/auth/AskPermissionActivity.java rename to play-services-core/src/main/java/org/microg/gms/auth/AskPermissionActivity.java diff --git a/src/org/microg/gms/auth/AuthManager.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java similarity index 100% rename from src/org/microg/gms/auth/AuthManager.java rename to play-services-core/src/main/java/org/microg/gms/auth/AuthManager.java diff --git a/src/org/microg/gms/auth/AuthManagerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java similarity index 100% rename from src/org/microg/gms/auth/AuthManagerServiceImpl.java rename to play-services-core/src/main/java/org/microg/gms/auth/AuthManagerServiceImpl.java diff --git a/src/org/microg/gms/auth/AuthRequest.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java similarity index 100% rename from src/org/microg/gms/auth/AuthRequest.java rename to play-services-core/src/main/java/org/microg/gms/auth/AuthRequest.java diff --git a/src/org/microg/gms/auth/AuthResponse.java b/play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java similarity index 100% rename from src/org/microg/gms/auth/AuthResponse.java rename to play-services-core/src/main/java/org/microg/gms/auth/AuthResponse.java diff --git a/src/org/microg/gms/auth/login/AssistantActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java similarity index 100% rename from src/org/microg/gms/auth/login/AssistantActivity.java rename to play-services-core/src/main/java/org/microg/gms/auth/login/AssistantActivity.java diff --git a/src/org/microg/gms/auth/login/LoginActivity.java b/play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java similarity index 100% rename from src/org/microg/gms/auth/login/LoginActivity.java rename to play-services-core/src/main/java/org/microg/gms/auth/login/LoginActivity.java diff --git a/src/org/microg/gms/auth/loginservice/AccountAuthenticator.java b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java similarity index 100% rename from src/org/microg/gms/auth/loginservice/AccountAuthenticator.java rename to play-services-core/src/main/java/org/microg/gms/auth/loginservice/AccountAuthenticator.java diff --git a/src/org/microg/gms/auth/loginservice/GoogleLoginService.java b/play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java similarity index 100% rename from src/org/microg/gms/auth/loginservice/GoogleLoginService.java rename to play-services-core/src/main/java/org/microg/gms/auth/loginservice/GoogleLoginService.java diff --git a/src/org/microg/gms/checkin/CheckinClient.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java similarity index 100% rename from src/org/microg/gms/checkin/CheckinClient.java rename to play-services-core/src/main/java/org/microg/gms/checkin/CheckinClient.java diff --git a/src/org/microg/gms/checkin/CheckinManager.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java similarity index 100% rename from src/org/microg/gms/checkin/CheckinManager.java rename to play-services-core/src/main/java/org/microg/gms/checkin/CheckinManager.java diff --git a/src/org/microg/gms/checkin/CheckinService.java b/play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java similarity index 100% rename from src/org/microg/gms/checkin/CheckinService.java rename to play-services-core/src/main/java/org/microg/gms/checkin/CheckinService.java diff --git a/src/org/microg/gms/checkin/LastCheckinInfo.java b/play-services-core/src/main/java/org/microg/gms/checkin/LastCheckinInfo.java similarity index 100% rename from src/org/microg/gms/checkin/LastCheckinInfo.java rename to play-services-core/src/main/java/org/microg/gms/checkin/LastCheckinInfo.java diff --git a/src/org/microg/gms/checkin/TriggerReceiver.java b/play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java similarity index 100% rename from src/org/microg/gms/checkin/TriggerReceiver.java rename to play-services-core/src/main/java/org/microg/gms/checkin/TriggerReceiver.java diff --git a/src/org/microg/gms/common/Build.java b/play-services-core/src/main/java/org/microg/gms/common/Build.java similarity index 100% rename from src/org/microg/gms/common/Build.java rename to play-services-core/src/main/java/org/microg/gms/common/Build.java diff --git a/src/org/microg/gms/common/DeviceConfiguration.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java similarity index 100% rename from src/org/microg/gms/common/DeviceConfiguration.java rename to play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java diff --git a/src/org/microg/gms/common/DeviceIdentifier.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java similarity index 100% rename from src/org/microg/gms/common/DeviceIdentifier.java rename to play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java diff --git a/src/org/microg/gms/common/HttpFormClient.java b/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java similarity index 100% rename from src/org/microg/gms/common/HttpFormClient.java rename to play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java diff --git a/src/org/microg/gms/common/PackageUtils.java b/play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java similarity index 100% rename from src/org/microg/gms/common/PackageUtils.java rename to play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java diff --git a/src/org/microg/gms/common/PhoneInfo.java b/play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java similarity index 100% rename from src/org/microg/gms/common/PhoneInfo.java rename to play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java diff --git a/src/org/microg/gms/common/Utils.java b/play-services-core/src/main/java/org/microg/gms/common/Utils.java similarity index 100% rename from src/org/microg/gms/common/Utils.java rename to play-services-core/src/main/java/org/microg/gms/common/Utils.java diff --git a/src/org/microg/gms/feeds/SubscribedFeedsProvider.java b/play-services-core/src/main/java/org/microg/gms/feeds/SubscribedFeedsProvider.java similarity index 100% rename from src/org/microg/gms/feeds/SubscribedFeedsProvider.java rename to play-services-core/src/main/java/org/microg/gms/feeds/SubscribedFeedsProvider.java diff --git a/src/org/microg/gms/gcm/GcmManager.java b/play-services-core/src/main/java/org/microg/gms/gcm/GcmManager.java similarity index 100% rename from src/org/microg/gms/gcm/GcmManager.java rename to play-services-core/src/main/java/org/microg/gms/gcm/GcmManager.java diff --git a/src/org/microg/gms/gcm/PushRegisterService.java b/play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java similarity index 100% rename from src/org/microg/gms/gcm/PushRegisterService.java rename to play-services-core/src/main/java/org/microg/gms/gcm/PushRegisterService.java diff --git a/src/org/microg/gms/gcm/RegisterRequest.java b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java similarity index 100% rename from src/org/microg/gms/gcm/RegisterRequest.java rename to play-services-core/src/main/java/org/microg/gms/gcm/RegisterRequest.java diff --git a/src/org/microg/gms/gcm/RegisterResponse.java b/play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java similarity index 100% rename from src/org/microg/gms/gcm/RegisterResponse.java rename to play-services-core/src/main/java/org/microg/gms/gcm/RegisterResponse.java diff --git a/src/org/microg/gms/gservices/DatabaseHelper.java b/play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java similarity index 100% rename from src/org/microg/gms/gservices/DatabaseHelper.java rename to play-services-core/src/main/java/org/microg/gms/gservices/DatabaseHelper.java diff --git a/src/org/microg/gms/gservices/GServices.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServices.java similarity index 100% rename from src/org/microg/gms/gservices/GServices.java rename to play-services-core/src/main/java/org/microg/gms/gservices/GServices.java diff --git a/src/org/microg/gms/gservices/GServicesProvider.java b/play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java similarity index 100% rename from src/org/microg/gms/gservices/GServicesProvider.java rename to play-services-core/src/main/java/org/microg/gms/gservices/GServicesProvider.java diff --git a/src/org/microg/gms/icing/AppDataSearchImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java similarity index 100% rename from src/org/microg/gms/icing/AppDataSearchImpl.java rename to play-services-core/src/main/java/org/microg/gms/icing/AppDataSearchImpl.java diff --git a/src/org/microg/gms/icing/IndexService.java b/play-services-core/src/main/java/org/microg/gms/icing/IndexService.java similarity index 100% rename from src/org/microg/gms/icing/IndexService.java rename to play-services-core/src/main/java/org/microg/gms/icing/IndexService.java diff --git a/src/org/microg/gms/icing/LightweightAppDataSearchImpl.java b/play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java similarity index 100% rename from src/org/microg/gms/icing/LightweightAppDataSearchImpl.java rename to play-services-core/src/main/java/org/microg/gms/icing/LightweightAppDataSearchImpl.java diff --git a/src/org/microg/gms/icing/LightweightIndexService.java b/play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java similarity index 100% rename from src/org/microg/gms/icing/LightweightIndexService.java rename to play-services-core/src/main/java/org/microg/gms/icing/LightweightIndexService.java diff --git a/src/org/microg/gms/location/GoogleLocationManager.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java similarity index 100% rename from src/org/microg/gms/location/GoogleLocationManager.java rename to play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManager.java diff --git a/src/org/microg/gms/location/GoogleLocationManagerService.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java similarity index 100% rename from src/org/microg/gms/location/GoogleLocationManagerService.java rename to play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerService.java diff --git a/src/org/microg/gms/location/GoogleLocationManagerServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java similarity index 100% rename from src/org/microg/gms/location/GoogleLocationManagerServiceImpl.java rename to play-services-core/src/main/java/org/microg/gms/location/GoogleLocationManagerServiceImpl.java diff --git a/src/org/microg/gms/location/LocationChangeListener.java b/play-services-core/src/main/java/org/microg/gms/location/LocationChangeListener.java similarity index 100% rename from src/org/microg/gms/location/LocationChangeListener.java rename to play-services-core/src/main/java/org/microg/gms/location/LocationChangeListener.java diff --git a/src/org/microg/gms/location/LocationRequestHelper.java b/play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java similarity index 100% rename from src/org/microg/gms/location/LocationRequestHelper.java rename to play-services-core/src/main/java/org/microg/gms/location/LocationRequestHelper.java diff --git a/src/org/microg/gms/location/MockLocationProvider.java b/play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java similarity index 100% rename from src/org/microg/gms/location/MockLocationProvider.java rename to play-services-core/src/main/java/org/microg/gms/location/MockLocationProvider.java diff --git a/src/org/microg/gms/location/RealLocationProvider.java b/play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java similarity index 100% rename from src/org/microg/gms/location/RealLocationProvider.java rename to play-services-core/src/main/java/org/microg/gms/location/RealLocationProvider.java diff --git a/src/org/microg/gms/location/ReportingAndroidService.java b/play-services-core/src/main/java/org/microg/gms/location/ReportingAndroidService.java similarity index 100% rename from src/org/microg/gms/location/ReportingAndroidService.java rename to play-services-core/src/main/java/org/microg/gms/location/ReportingAndroidService.java diff --git a/src/org/microg/gms/location/ReportingServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/location/ReportingServiceImpl.java similarity index 100% rename from src/org/microg/gms/location/ReportingServiceImpl.java rename to play-services-core/src/main/java/org/microg/gms/location/ReportingServiceImpl.java diff --git a/src/org/microg/gms/maps/BackendMap.java b/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java similarity index 100% rename from src/org/microg/gms/maps/BackendMap.java rename to play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java diff --git a/src/org/microg/gms/maps/ContextContainer.java b/play-services-core/src/main/java/org/microg/gms/maps/ContextContainer.java similarity index 100% rename from src/org/microg/gms/maps/ContextContainer.java rename to play-services-core/src/main/java/org/microg/gms/maps/ContextContainer.java diff --git a/src/org/microg/gms/maps/GmsMapsTypeHelper.java b/play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java similarity index 100% rename from src/org/microg/gms/maps/GmsMapsTypeHelper.java rename to play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java diff --git a/src/org/microg/gms/maps/GoogleMapImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java similarity index 100% rename from src/org/microg/gms/maps/GoogleMapImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java diff --git a/src/org/microg/gms/maps/MapFragmentImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java similarity index 100% rename from src/org/microg/gms/maps/MapFragmentImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java diff --git a/src/org/microg/gms/maps/MapViewImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java similarity index 100% rename from src/org/microg/gms/maps/MapViewImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java diff --git a/src/org/microg/gms/maps/ProjectionImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java similarity index 100% rename from src/org/microg/gms/maps/ProjectionImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java diff --git a/src/org/microg/gms/maps/ResourcesContainer.java b/play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java similarity index 100% rename from src/org/microg/gms/maps/ResourcesContainer.java rename to play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java diff --git a/src/org/microg/gms/maps/UiSettingsImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java similarity index 100% rename from src/org/microg/gms/maps/UiSettingsImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java diff --git a/src/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java diff --git a/src/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java diff --git a/src/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java diff --git a/src/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java diff --git a/src/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java diff --git a/src/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java diff --git a/src/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java diff --git a/src/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java diff --git a/src/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java b/play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java similarity index 100% rename from src/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java rename to play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java diff --git a/src/org/microg/gms/maps/camera/CameraUpdate.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java similarity index 100% rename from src/org/microg/gms/maps/camera/CameraUpdate.java rename to play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java diff --git a/src/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java similarity index 100% rename from src/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java diff --git a/src/org/microg/gms/maps/camera/MapPositionCameraUpdate.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java similarity index 100% rename from src/org/microg/gms/maps/camera/MapPositionCameraUpdate.java rename to play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java diff --git a/src/org/microg/gms/maps/camera/NoCameraUpdate.java b/play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java similarity index 100% rename from src/org/microg/gms/maps/camera/NoCameraUpdate.java rename to play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java diff --git a/src/org/microg/gms/maps/markup/CircleImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java similarity index 100% rename from src/org/microg/gms/maps/markup/CircleImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java diff --git a/src/org/microg/gms/maps/markup/GroundOverlayImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java similarity index 100% rename from src/org/microg/gms/maps/markup/GroundOverlayImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java diff --git a/src/org/microg/gms/maps/markup/InfoWindow.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java similarity index 100% rename from src/org/microg/gms/maps/markup/InfoWindow.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java diff --git a/src/org/microg/gms/maps/markup/MarkerImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java similarity index 100% rename from src/org/microg/gms/maps/markup/MarkerImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java diff --git a/src/org/microg/gms/maps/markup/Markup.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java similarity index 100% rename from src/org/microg/gms/maps/markup/Markup.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java diff --git a/src/org/microg/gms/maps/markup/PolygonImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java similarity index 100% rename from src/org/microg/gms/maps/markup/PolygonImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java diff --git a/src/org/microg/gms/maps/markup/PolylineImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java similarity index 100% rename from src/org/microg/gms/maps/markup/PolylineImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java diff --git a/src/org/microg/gms/maps/markup/TileOverlayImpl.java b/play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java similarity index 100% rename from src/org/microg/gms/maps/markup/TileOverlayImpl.java rename to play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java diff --git a/src/org/microg/gms/mdm/NetworkQualityService.java b/play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java similarity index 100% rename from src/org/microg/gms/mdm/NetworkQualityService.java rename to play-services-core/src/main/java/org/microg/gms/mdm/NetworkQualityService.java diff --git a/src/org/microg/gms/people/DatabaseHelper.java b/play-services-core/src/main/java/org/microg/gms/people/DatabaseHelper.java similarity index 100% rename from src/org/microg/gms/people/DatabaseHelper.java rename to play-services-core/src/main/java/org/microg/gms/people/DatabaseHelper.java diff --git a/src/org/microg/gms/people/PeopleManager.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java similarity index 100% rename from src/org/microg/gms/people/PeopleManager.java rename to play-services-core/src/main/java/org/microg/gms/people/PeopleManager.java diff --git a/src/org/microg/gms/people/PeopleService.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleService.java similarity index 100% rename from src/org/microg/gms/people/PeopleService.java rename to play-services-core/src/main/java/org/microg/gms/people/PeopleService.java diff --git a/src/org/microg/gms/people/PeopleServiceImpl.java b/play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java similarity index 100% rename from src/org/microg/gms/people/PeopleServiceImpl.java rename to play-services-core/src/main/java/org/microg/gms/people/PeopleServiceImpl.java diff --git a/src/org/microg/gms/plus/PlusOneButtonImpl.java b/play-services-core/src/main/java/org/microg/gms/plus/PlusOneButtonImpl.java similarity index 100% rename from src/org/microg/gms/plus/PlusOneButtonImpl.java rename to play-services-core/src/main/java/org/microg/gms/plus/PlusOneButtonImpl.java diff --git a/src/org/microg/gms/settings/GoogleSettingsProvider.java b/play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java similarity index 100% rename from src/org/microg/gms/settings/GoogleSettingsProvider.java rename to play-services-core/src/main/java/org/microg/gms/settings/GoogleSettingsProvider.java diff --git a/src/org/microg/gms/wearable/WearableService.java b/play-services-core/src/main/java/org/microg/gms/wearable/WearableService.java similarity index 100% rename from src/org/microg/gms/wearable/WearableService.java rename to play-services-core/src/main/java/org/microg/gms/wearable/WearableService.java diff --git a/src/org/microg/tools/AccountPickerActivity.java b/play-services-core/src/main/java/org/microg/tools/AccountPickerActivity.java similarity index 100% rename from src/org/microg/tools/AccountPickerActivity.java rename to play-services-core/src/main/java/org/microg/tools/AccountPickerActivity.java diff --git a/protos-src/org/microg/gms/auth/ConsentData.java b/play-services-core/src/main/protos-java/org/microg/gms/auth/ConsentData.java similarity index 100% rename from protos-src/org/microg/gms/auth/ConsentData.java rename to play-services-core/src/main/protos-java/org/microg/gms/auth/ConsentData.java diff --git a/protos-src/org/microg/gms/checkin/CheckinRequest.java b/play-services-core/src/main/protos-java/org/microg/gms/checkin/CheckinRequest.java similarity index 100% rename from protos-src/org/microg/gms/checkin/CheckinRequest.java rename to play-services-core/src/main/protos-java/org/microg/gms/checkin/CheckinRequest.java diff --git a/protos-src/org/microg/gms/checkin/CheckinResponse.java b/play-services-core/src/main/protos-java/org/microg/gms/checkin/CheckinResponse.java similarity index 100% rename from protos-src/org/microg/gms/checkin/CheckinResponse.java rename to play-services-core/src/main/protos-java/org/microg/gms/checkin/CheckinResponse.java diff --git a/protos-repo/auth.proto b/play-services-core/src/main/protos-repo/auth.proto similarity index 100% rename from protos-repo/auth.proto rename to play-services-core/src/main/protos-repo/auth.proto diff --git a/protos-repo/checkin.proto b/play-services-core/src/main/protos-repo/checkin.proto similarity index 100% rename from protos-repo/checkin.proto rename to play-services-core/src/main/protos-repo/checkin.proto diff --git a/res/drawable-hdpi/ic_generic_man.png b/play-services-core/src/main/res/drawable-hdpi/ic_generic_man.png similarity index 100% rename from res/drawable-hdpi/ic_generic_man.png rename to play-services-core/src/main/res/drawable-hdpi/ic_generic_man.png diff --git a/res/drawable-hdpi/ic_microg_app.png b/play-services-core/src/main/res/drawable-hdpi/ic_microg_app.png similarity index 100% rename from res/drawable-hdpi/ic_microg_app.png rename to play-services-core/src/main/res/drawable-hdpi/ic_microg_app.png diff --git a/res/drawable-mdpi/ic_generic_man.png b/play-services-core/src/main/res/drawable-mdpi/ic_generic_man.png similarity index 100% rename from res/drawable-mdpi/ic_generic_man.png rename to play-services-core/src/main/res/drawable-mdpi/ic_generic_man.png diff --git a/res/drawable-mdpi/ic_microg_app.png b/play-services-core/src/main/res/drawable-mdpi/ic_microg_app.png similarity index 100% rename from res/drawable-mdpi/ic_microg_app.png rename to play-services-core/src/main/res/drawable-mdpi/ic_microg_app.png diff --git a/res/drawable-nodpi/nop.png b/play-services-core/src/main/res/drawable-nodpi/nop.png similarity index 100% rename from res/drawable-nodpi/nop.png rename to play-services-core/src/main/res/drawable-nodpi/nop.png diff --git a/res/drawable-xhdpi/ic_generic_man.png b/play-services-core/src/main/res/drawable-xhdpi/ic_generic_man.png similarity index 100% rename from res/drawable-xhdpi/ic_generic_man.png rename to play-services-core/src/main/res/drawable-xhdpi/ic_generic_man.png diff --git a/res/drawable-xhdpi/ic_microg_app.png b/play-services-core/src/main/res/drawable-xhdpi/ic_microg_app.png similarity index 100% rename from res/drawable-xhdpi/ic_microg_app.png rename to play-services-core/src/main/res/drawable-xhdpi/ic_microg_app.png diff --git a/res/drawable-xhdpi/maps_default_marker.png b/play-services-core/src/main/res/drawable-xhdpi/maps_default_marker.png similarity index 100% rename from res/drawable-xhdpi/maps_default_marker.png rename to play-services-core/src/main/res/drawable-xhdpi/maps_default_marker.png diff --git a/res/drawable-xhdpi/maps_default_window.9.png b/play-services-core/src/main/res/drawable-xhdpi/maps_default_window.9.png similarity index 100% rename from res/drawable-xhdpi/maps_default_window.9.png rename to play-services-core/src/main/res/drawable-xhdpi/maps_default_window.9.png diff --git a/res/drawable-xhdpi/proprietary_auth_gls_ic_google_minitab_selected.png b/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_minitab_selected.png similarity index 100% rename from res/drawable-xhdpi/proprietary_auth_gls_ic_google_minitab_selected.png rename to play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_minitab_selected.png diff --git a/res/drawable-xhdpi/proprietary_auth_gls_ic_google_selected.png b/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_selected.png similarity index 100% rename from res/drawable-xhdpi/proprietary_auth_gls_ic_google_selected.png rename to play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_gls_ic_google_selected.png diff --git a/res/drawable-xhdpi/proprietary_auth_ic_scope_icon_default.png b/play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_ic_scope_icon_default.png similarity index 100% rename from res/drawable-xhdpi/proprietary_auth_ic_scope_icon_default.png rename to play-services-core/src/main/res/drawable-xhdpi/proprietary_auth_ic_scope_icon_default.png diff --git a/res/drawable-xxhdpi/ic_generic_man.png b/play-services-core/src/main/res/drawable-xxhdpi/ic_generic_man.png similarity index 100% rename from res/drawable-xxhdpi/ic_generic_man.png rename to play-services-core/src/main/res/drawable-xxhdpi/ic_generic_man.png diff --git a/res/drawable-xxhdpi/ic_microg_app.png b/play-services-core/src/main/res/drawable-xxhdpi/ic_microg_app.png similarity index 100% rename from res/drawable-xxhdpi/ic_microg_app.png rename to play-services-core/src/main/res/drawable-xxhdpi/ic_microg_app.png diff --git a/res/drawable-xxxhdpi/ic_microg_app.png b/play-services-core/src/main/res/drawable-xxxhdpi/ic_microg_app.png similarity index 100% rename from res/drawable-xxxhdpi/ic_microg_app.png rename to play-services-core/src/main/res/drawable-xxxhdpi/ic_microg_app.png diff --git a/res/drawable/circle_shape_background.xml b/play-services-core/src/main/res/drawable/circle_shape_background.xml similarity index 100% rename from res/drawable/circle_shape_background.xml rename to play-services-core/src/main/res/drawable/circle_shape_background.xml diff --git a/res/drawable/ic_plusone_medium.xml b/play-services-core/src/main/res/drawable/ic_plusone_medium.xml similarity index 100% rename from res/drawable/ic_plusone_medium.xml rename to play-services-core/src/main/res/drawable/ic_plusone_medium.xml diff --git a/res/drawable/ic_plusone_small.xml b/play-services-core/src/main/res/drawable/ic_plusone_small.xml similarity index 100% rename from res/drawable/ic_plusone_small.xml rename to play-services-core/src/main/res/drawable/ic_plusone_small.xml diff --git a/res/drawable/ic_plusone_standard.xml b/play-services-core/src/main/res/drawable/ic_plusone_standard.xml similarity index 100% rename from res/drawable/ic_plusone_standard.xml rename to play-services-core/src/main/res/drawable/ic_plusone_standard.xml diff --git a/res/drawable/ic_plusone_tall.xml b/play-services-core/src/main/res/drawable/ic_plusone_tall.xml similarity index 100% rename from res/drawable/ic_plusone_tall.xml rename to play-services-core/src/main/res/drawable/ic_plusone_tall.xml diff --git a/res/layout/ask_permission.xml b/play-services-core/src/main/res/layout/ask_permission.xml similarity index 100% rename from res/layout/ask_permission.xml rename to play-services-core/src/main/res/layout/ask_permission.xml diff --git a/res/layout/ask_permission_list_entry.xml b/play-services-core/src/main/res/layout/ask_permission_list_entry.xml similarity index 100% rename from res/layout/ask_permission_list_entry.xml rename to play-services-core/src/main/res/layout/ask_permission_list_entry.xml diff --git a/res/layout/login_assistant.xml b/play-services-core/src/main/res/layout/login_assistant.xml similarity index 100% rename from res/layout/login_assistant.xml rename to play-services-core/src/main/res/layout/login_assistant.xml diff --git a/res/layout/login_assistant_loading.xml b/play-services-core/src/main/res/layout/login_assistant_loading.xml similarity index 100% rename from res/layout/login_assistant_loading.xml rename to play-services-core/src/main/res/layout/login_assistant_loading.xml diff --git a/res/layout/toolbar.xml b/play-services-core/src/main/res/layout/toolbar.xml similarity index 100% rename from res/layout/toolbar.xml rename to play-services-core/src/main/res/layout/toolbar.xml diff --git a/res/values/colors.xml b/play-services-core/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to play-services-core/src/main/res/values/colors.xml diff --git a/res/values/dimens.xml b/play-services-core/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to play-services-core/src/main/res/values/dimens.xml diff --git a/res/values/permissions.xml b/play-services-core/src/main/res/values/permissions.xml similarity index 100% rename from res/values/permissions.xml rename to play-services-core/src/main/res/values/permissions.xml diff --git a/res/values/signature.xml b/play-services-core/src/main/res/values/signature.xml similarity index 100% rename from res/values/signature.xml rename to play-services-core/src/main/res/values/signature.xml diff --git a/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to play-services-core/src/main/res/values/strings.xml diff --git a/res/values/themes.xml b/play-services-core/src/main/res/values/themes.xml similarity index 100% rename from res/values/themes.xml rename to play-services-core/src/main/res/values/themes.xml diff --git a/res/xml/account_preferences.xml b/play-services-core/src/main/res/xml/account_preferences.xml similarity index 100% rename from res/xml/account_preferences.xml rename to play-services-core/src/main/res/xml/account_preferences.xml diff --git a/res/xml/authenticator.xml b/play-services-core/src/main/res/xml/authenticator.xml similarity index 100% rename from res/xml/authenticator.xml rename to play-services-core/src/main/res/xml/authenticator.xml diff --git a/settings.gradle b/settings.gradle index 96ee8319..fd73113a 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,7 @@ -include 'UnifiedNlpApi' -include 'UnifiedNlpLib', 'UnifiedNlpLib:compat' -include 'SafeParcel' -include 'GmsApi' +include ':UnifiedNlpApi' +include ':UnifiedNlpLib' +include ':UnifiedNlpLib:compat' + +include ':SafeParcel' +include ':play-services-api' +include ':play-services-core'