diff --git a/play-services-ads-api/build.gradle b/play-services-ads-api/build.gradle new file mode 100644 index 000000000..4c4a82675 --- /dev/null +++ b/play-services-ads-api/build.gradle @@ -0,0 +1,46 @@ +/* + * SPDX-FileCopyrightText: 2026 microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply plugin: 'signing' + +android { + namespace "com.google.android.gms.ads" + + compileSdkVersion androidCompileSdk + buildToolsVersion "$androidBuildVersionTools" + + buildFeatures { + aidl = true + } + + defaultConfig { + versionName version + minSdkVersion androidMinSdk + targetSdkVersion androidTargetSdk + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } +} + +apply from: '../gradle/publish-android.gradle' + +description = 'microG implementation of play-services-ads-api' + +dependencies { + // Dependencies from play-services-ads-api:25.3.0 + api 'androidx.browser:browser:1.8.0' + api 'androidx.core:core:1.10.1' + api 'androidx.datastore:datastore:1.0.0' + api 'androidx.work:work-runtime:2.7.0' + //api 'com.google.android.ump:user-messaging-platform:4.0.0' + api project(':play-services-basement') + //api project(':play-services-measurement-sdk-api') + annotationProcessor project(':safe-parcel-processor') +} diff --git a/play-services-ads-lite/core/build.gradle b/play-services-ads-api/core/build.gradle similarity index 94% rename from play-services-ads-lite/core/build.gradle rename to play-services-ads-api/core/build.gradle index 4c4832ef5..9beb7b8c9 100644 --- a/play-services-ads-lite/core/build.gradle +++ b/play-services-ads-api/core/build.gradle @@ -7,7 +7,7 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' dependencies { - api project(':play-services-ads-lite') + api project(':play-services-ads-api') implementation project(':play-services-base-core') } diff --git a/play-services-ads-lite/core/src/main/AndroidManifest.xml b/play-services-ads-api/core/src/main/AndroidManifest.xml similarity index 100% rename from play-services-ads-lite/core/src/main/AndroidManifest.xml rename to play-services-ads-api/core/src/main/AndroidManifest.xml diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/AdLoaderBuilderCreatorImpl.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/AdLoaderBuilderCreatorImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/AdLoaderBuilderCreatorImpl.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/AdLoaderBuilderCreatorImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/AdManagerCreatorImpl.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/AdManagerCreatorImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/AdManagerCreatorImpl.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/AdManagerCreatorImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdLoaderBuilderCreatorImpl.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdLoaderBuilderCreatorImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdLoaderBuilderCreatorImpl.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdLoaderBuilderCreatorImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdManagerCreatorImpl.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdManagerCreatorImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdManagerCreatorImpl.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/ChimeraAdManagerCreatorImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/ChimeraMobileAdsSettingManagerCreatorImpl.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/ChimeraMobileAdsSettingManagerCreatorImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/ChimeraMobileAdsSettingManagerCreatorImpl.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/ChimeraMobileAdsSettingManagerCreatorImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdLoaderBuilder.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdLoaderBuilder.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdLoaderBuilder.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdLoaderBuilder.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdManager.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdManager.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdManager.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/LegacyAdManager.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/MobileAdsSettingManagerCreatorImpl.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/MobileAdsSettingManagerCreatorImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/MobileAdsSettingManagerCreatorImpl.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/MobileAdsSettingManagerCreatorImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/measurement/DynamiteMeasurementManager.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/measurement/DynamiteMeasurementManager.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/measurement/DynamiteMeasurementManager.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/measurement/DynamiteMeasurementManager.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/rewarded/ChimeraRewardedAdCreatorImpl.kt b/play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/rewarded/ChimeraRewardedAdCreatorImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/com/google/android/gms/ads/rewarded/ChimeraRewardedAdCreatorImpl.kt rename to play-services-ads-api/core/src/main/kotlin/com/google/android/gms/ads/rewarded/ChimeraRewardedAdCreatorImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/org/microg/gms/ads/MobileAdsSettingManagerImpl.kt b/play-services-ads-api/core/src/main/kotlin/org/microg/gms/ads/MobileAdsSettingManagerImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/org/microg/gms/ads/MobileAdsSettingManagerImpl.kt rename to play-services-ads-api/core/src/main/kotlin/org/microg/gms/ads/MobileAdsSettingManagerImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/org/microg/gms/ads/rewarded/ResponseInfoImpl.kt b/play-services-ads-api/core/src/main/kotlin/org/microg/gms/ads/rewarded/ResponseInfoImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/org/microg/gms/ads/rewarded/ResponseInfoImpl.kt rename to play-services-ads-api/core/src/main/kotlin/org/microg/gms/ads/rewarded/ResponseInfoImpl.kt diff --git a/play-services-ads-lite/core/src/main/kotlin/org/microg/gms/ads/rewarded/RewardedAdImpl.kt b/play-services-ads-api/core/src/main/kotlin/org/microg/gms/ads/rewarded/RewardedAdImpl.kt similarity index 100% rename from play-services-ads-lite/core/src/main/kotlin/org/microg/gms/ads/rewarded/RewardedAdImpl.kt rename to play-services-ads-api/core/src/main/kotlin/org/microg/gms/ads/rewarded/RewardedAdImpl.kt diff --git a/play-services-ads-api/src/main/AndroidManifest.xml b/play-services-ads-api/src/main/AndroidManifest.xml new file mode 100644 index 000000000..3b29c9d5f --- /dev/null +++ b/play-services-ads-api/src/main/AndroidManifest.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/formats/AdManagerAdViewOptions.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/formats/AdManagerAdViewOptions.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/formats/AdManagerAdViewOptions.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/formats/AdManagerAdViewOptions.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/formats/PublisherAdViewOptions.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/formats/PublisherAdViewOptions.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/formats/PublisherAdViewOptions.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/formats/PublisherAdViewOptions.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdErrorParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdErrorParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdErrorParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdErrorParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdRequestParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdRequestParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdRequestParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdRequestParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdapterStatusParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdapterStatusParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/AdapterStatusParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/AdapterStatusParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/RequestConfigurationParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/RequestConfigurationParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/RequestConfigurationParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/RequestConfigurationParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/AdSizeParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/AdSizeParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/AdSizeParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/AdSizeParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/AdValueParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/AdValueParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/AdValueParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/AdValueParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdClickListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdClickListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdClickListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdClickListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoadCallback.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoadCallback.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoadCallback.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoadCallback.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoader.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoader.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoader.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoader.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilder.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilder.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilder.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilder.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilderCreator.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilderCreator.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilderCreator.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdLoaderBuilderCreator.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManager.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManager.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManager.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManager.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManagerCreator.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManagerCreator.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManagerCreator.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAdManagerCreator.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAppEventListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAppEventListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IAppEventListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IAppEventListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/ICorrelationIdProvider.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/ICorrelationIdProvider.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/ICorrelationIdProvider.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/ICorrelationIdProvider.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IFullScreenContentCallback.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IFullScreenContentCallback.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IFullScreenContentCallback.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IFullScreenContentCallback.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManager.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManager.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManager.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManager.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManagerCreator.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManagerCreator.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManagerCreator.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IMobileAdsSettingManagerCreator.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdInspectorClosedListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdInspectorClosedListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdInspectorClosedListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdInspectorClosedListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdMetadataChangedListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdMetadataChangedListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdMetadataChangedListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IOnAdMetadataChangedListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IOnPaidEventListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IOnPaidEventListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IOnPaidEventListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IOnPaidEventListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IResponseInfo.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IResponseInfo.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IResponseInfo.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IResponseInfo.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoController.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoController.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoController.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoController.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoLifecycleCallbacks.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoLifecycleCallbacks.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoLifecycleCallbacks.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/client/IVideoLifecycleCallbacks.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IAttributionInfo.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IAttributionInfo.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IAttributionInfo.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IAttributionInfo.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAdImage.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAdImage.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAdImage.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAdImage.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAppInstallAd.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAppInstallAd.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAppInstallAd.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeAppInstallAd.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeContentAd.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeContentAd.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeContentAd.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeContentAd.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeCustomTemplateAd.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeCustomTemplateAd.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeCustomTemplateAd.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/INativeCustomTemplateAd.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnAppInstallAdLoadedListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnAppInstallAdLoadedListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnAppInstallAdLoadedListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnAppInstallAdLoadedListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnContentAdLoadedListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnContentAdLoadedListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnContentAdLoadedListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnContentAdLoadedListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomClickListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomClickListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomClickListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomClickListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomTemplateAdLoadedListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomTemplateAdLoadedListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomTemplateAdLoadedListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnCustomTemplateAdLoadedListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnPublisherAdViewLoadedListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnPublisherAdViewLoadedListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnPublisherAdViewLoadedListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnPublisherAdViewLoadedListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnUnifiedNativeAdLoadedListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnUnifiedNativeAdLoadedListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnUnifiedNativeAdLoadedListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IOnUnifiedNativeAdLoadedListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IUnifiedNativeAd.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IUnifiedNativeAd.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IUnifiedNativeAd.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/formats/client/IUnifiedNativeAd.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/initialization/IInitializationCallback.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/initialization/IInitializationCallback.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/initialization/IInitializationCallback.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/initialization/IInitializationCallback.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAd.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAd.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAd.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAd.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAdLoadCallback.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAdLoadCallback.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAdLoadCallback.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/instream/client/IInstreamAdLoadCallback.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/mediation/client/IAdapterCreator.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/mediation/client/IAdapterCreator.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/mediation/client/IAdapterCreator.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/mediation/client/IAdapterCreator.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardItem.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardItem.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardItem.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardItem.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAd.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAd.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAd.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAd.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCallback.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCallback.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCallback.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCallback.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCreator.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCreator.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCreator.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdCreator.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdLoadCallback.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdLoadCallback.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdLoadCallback.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdLoadCallback.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdSkuListener.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdSkuListener.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdSkuListener.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/internal/rewarded/client/IRewardedAdSkuListener.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/measurement/IAppMeasurementProxy.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/measurement/IAppMeasurementProxy.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/measurement/IAppMeasurementProxy.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/measurement/IAppMeasurementProxy.aidl diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/measurement/IMeasurementManager.aidl b/play-services-ads-api/src/main/aidl/com/google/android/gms/ads/measurement/IMeasurementManager.aidl similarity index 100% rename from play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/measurement/IMeasurementManager.aidl rename to play-services-ads-api/src/main/aidl/com/google/android/gms/ads/measurement/IMeasurementManager.aidl diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/admanager/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/admanager/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/admanager/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/admanager/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/formats/AdManagerAdViewOptions.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/formats/AdManagerAdViewOptions.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/formats/AdManagerAdViewOptions.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/formats/AdManagerAdViewOptions.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/formats/PublisherAdViewOptions.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/formats/PublisherAdViewOptions.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/formats/PublisherAdViewOptions.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/formats/PublisherAdViewOptions.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/h5/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/h5/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/h5/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/h5/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/initialization/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/initialization/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/initialization/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/initialization/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdDataParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdDataParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdDataParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdDataParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdErrorParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdErrorParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdErrorParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdErrorParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdRequestParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdRequestParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdRequestParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdRequestParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdapterResponseInfoParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdapterStatusParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdapterStatusParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/AdapterStatusParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/AdapterStatusParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/RequestConfigurationParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/RequestConfigurationParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/RequestConfigurationParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/RequestConfigurationParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/SearchAdRequestParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/SearchAdRequestParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/SearchAdRequestParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/SearchAdRequestParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/ServerSideVerificationOptionsParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/client/AdSizeParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/client/AdSizeParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/client/AdSizeParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/client/AdSizeParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/client/AdValueParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/client/AdValueParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/client/AdValueParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/client/AdValueParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/client/VideoOptionsParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/client/VideoOptionsParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/client/VideoOptionsParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/client/VideoOptionsParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/formats/NativeAdOptionsParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/internal/instream/InstreamAdConfigurationParcel.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/interstitial/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/interstitial/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/interstitial/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/interstitial/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/mediation/customevent/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/mediation/customevent/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/mediation/customevent/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/mediation/customevent/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/mediation/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/mediation/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/mediation/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/mediation/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/mediation/rtb/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/mediation/rtb/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/mediation/rtb/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/mediation/rtb/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/nativead/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/nativead/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/nativead/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/nativead/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/rewarded/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/rewarded/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/rewarded/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/rewarded/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/rewardedinterstitial/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/rewardedinterstitial/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/rewardedinterstitial/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/rewardedinterstitial/package-info.java diff --git a/play-services-ads-lite/src/main/java/com/google/android/gms/ads/search/package-info.java b/play-services-ads-api/src/main/java/com/google/android/gms/ads/search/package-info.java similarity index 100% rename from play-services-ads-lite/src/main/java/com/google/android/gms/ads/search/package-info.java rename to play-services-ads-api/src/main/java/com/google/android/gms/ads/search/package-info.java diff --git a/play-services-ads-lite/build.gradle b/play-services-ads-lite/build.gradle index 61742681f..a38f75067 100644 --- a/play-services-ads-lite/build.gradle +++ b/play-services-ads-lite/build.gradle @@ -8,7 +8,7 @@ apply plugin: 'maven-publish' apply plugin: 'signing' android { - namespace "com.google.android.gms.ads" + namespace "com.google.android.gms.ads_lite" compileSdkVersion androidCompileSdk buildToolsVersion "$androidBuildVersionTools" @@ -34,10 +34,6 @@ apply from: '../gradle/publish-android.gradle' description = 'microG implementation of play-services-ads-lite' dependencies { - api 'androidx.work:work-runtime:2.7.0' - api project(':play-services-ads-base') - api project(':play-services-basement') - annotationProcessor project(':safe-parcel-processor') -// api project(':play-services-measurement-sdk-api') -// api project(':user-messaging-platform') + // Dependencies from play-services-ads-lite:25.0.0 + api project(':play-services-ads-api') } diff --git a/play-services-ads-lite/src/main/AndroidManifest.xml b/play-services-ads-lite/src/main/AndroidManifest.xml index 1b55c5b81..3408ac920 100644 --- a/play-services-ads-lite/src/main/AndroidManifest.xml +++ b/play-services-ads-lite/src/main/AndroidManifest.xml @@ -4,23 +4,5 @@ --> - - - - - - - - - - - - - - - - - diff --git a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/AdManagerCreator.aidl b/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/AdManagerCreator.aidl deleted file mode 100644 index 7e07dd018..000000000 --- a/play-services-ads-lite/src/main/aidl/com/google/android/gms/ads/AdManagerCreator.aidl +++ /dev/null @@ -1,4 +0,0 @@ -package com.google.android.gms.ads; - -interface AdManagerCreator { -} \ No newline at end of file diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index a348337ce..967b2d442 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -21,8 +21,8 @@ dependencies { implementation project(':firebase-dynamic-links') implementation project(':firebase-auth-core') implementation project(':play-services-ads-core') + implementation project(':play-services-ads-api-core') implementation project(':play-services-ads-identifier-core') - implementation project(':play-services-ads-lite-core') implementation project(':play-services-appinvite-core') implementation project(':play-services-appset-core') implementation project(':play-services-auth-api-phone-core') diff --git a/settings.gradle b/settings.gradle index 1ab99b900..a5bc84ca3 100644 --- a/settings.gradle +++ b/settings.gradle @@ -21,6 +21,7 @@ include ':safe-parcel-processor' include ':vending-app' include ':play-services-ads' +include ':play-services-ads-api' include ':play-services-ads-base' include ':play-services-ads-identifier' include ':play-services-ads-lite' @@ -79,8 +80,8 @@ sublude ':play-services-basement:ktx' sublude ':play-services-tasks:ktx' sublude ':play-services-ads:core' +sublude ':play-services-ads-api:core' sublude ':play-services-ads-identifier:core' -sublude ':play-services-ads-lite:core' sublude ':play-services-appinvite:core' sublude ':play-services-appset:core' sublude ':play-services-auth-api-phone:core'