diff options
| author | Neha Pattan <npattan@google.com> | 2023-02-17 18:34:54 +0000 |
|---|---|---|
| committer | Neha Pattan <npattan@google.com> | 2023-02-17 22:07:10 +0000 |
| commit | 43d8b2a74e1a584bd771c6f62187cd6fcab33d20 (patch) | |
| tree | eca0e8270c499d1fde167c5264f4dfcb27049f62 | |
| parent | 3436fde574dfb794d2c3333f6554298c3baa74cf (diff) | |
| parent | 82c1901ee3db83639a8821ec24c7053f5c78572a (diff) | |
| download | mobile-data-download-43d8b2a74e1a584bd771c6f62187cd6fcab33d20.tar.gz | |
Merge "Rb back compat: Base changes" into tm-mainline-prod am: 82c1901ee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobile-data-download/+/21185749
Change-Id: If5212300df4b612c9f54ca61e9f5b1414c3fa7dd
Merged-In: I366d3778a3983aa83537ec20a213586312448d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Bug: 263816046
Ignore-AOSP-First: Automerger fix
| -rw-r--r-- | Android.bp | 8 | ||||
| -rw-r--r-- | java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp | 3 | ||||
| -rw-r--r-- | proto/Android.bp | 3 |
3 files changed, 9 insertions, 5 deletions
@@ -37,6 +37,7 @@ java_library { apex_available: [ "//apex_available:platform", "com.android.adservices", + "com.android.extservices", "com.android.ondevicepersonalization", ], } @@ -110,11 +111,12 @@ android_library { apex_available: [ "//apex_available:platform", "com.android.adservices", - "com.android.ondevicepersonalization", + "com.android.extservices", + "com.android.ondevicepersonalization", ], visibility: [ "//packages/modules/AdServices:__subpackages__", - "//packages/modules/OnDevicePersonalization:__subpackages__", + "//packages/modules/OnDevicePersonalization:__subpackages__", ":__subpackages__", ], errorprone: { @@ -122,4 +124,4 @@ android_library { "-Xep:NoCanIgnoreReturnValueOnClasses:WARN", ], }, -}
\ No newline at end of file +} diff --git a/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp b/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp index e117b66..1110b02 100644 --- a/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp +++ b/java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp @@ -44,6 +44,7 @@ java_library { apex_available: [ "//apex_available:platform", "com.android.adservices", - "com.android.ondevicepersonalization", + "com.android.extservices", + "com.android.ondevicepersonalization", ], } diff --git a/proto/Android.bp b/proto/Android.bp index 198768f..40a3017 100644 --- a/proto/Android.bp +++ b/proto/Android.bp @@ -41,6 +41,7 @@ java_library { apex_available: [ "//apex_available:platform", "com.android.adservices", - "com.android.ondevicepersonalization", + "com.android.extservices", + "com.android.ondevicepersonalization", ], } |