summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeha Pattan <npattan@google.com>2023-02-19 03:36:44 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-02-19 03:36:44 +0000
commit3a067b5d70b0429acc213c9c16a2b19037810829 (patch)
treeeca0e8270c499d1fde167c5264f4dfcb27049f62
parent3436fde574dfb794d2c3333f6554298c3baa74cf (diff)
parent43d8b2a74e1a584bd771c6f62187cd6fcab33d20 (diff)
downloadmobile-data-download-3a067b5d70b0429acc213c9c16a2b19037810829.tar.gz
Merge "Rb back compat: Base changes" into tm-mainline-prod am: 82c1901ee3 am: 43d8b2a74e
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mobile-data-download/+/21482435 Change-Id: If02ebe6ccd38c856d09be48fd49c870061f6d4f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp8
-rw-r--r--java/com/google/android/libraries/mobiledatadownload/populator/proto/Android.bp3
-rw-r--r--proto/Android.bp3
3 files changed, 9 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index e3adbce..4324928 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
],
}