summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neha Pattan <npattan@google.com> 2022-12-27 21:58:07 +0000
committer Neha Pattan <npattan@google.com> 2023-02-15 17:28:29 +0000
commit6c1469ab71bba788e92b20077a611993b91130f1 (patch)
treec51885b857d05b898d0989331b9d191ce78c1ed3
parentc11f20c1af6f626ce278c73827b9f982c3e49ee8 (diff)
(TM-MP) Rb back compat: Base changes
Bug: 263816046 Test: manual Change-Id: I282cceadded830d98fefe5f7d46e7f7ad640c4fe
-rw-r--r--packages/SettingsLib/ActionBarShadow/Android.bp1
-rw-r--r--packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp1
-rw-r--r--packages/SettingsLib/MainSwitchPreference/Android.bp1
-rw-r--r--packages/SettingsLib/SettingsTheme/Android.bp5
-rw-r--r--packages/SettingsLib/SettingsTransition/Android.bp1
-rw-r--r--packages/SettingsLib/Utils/Android.bp3
6 files changed, 8 insertions, 4 deletions
diff --git a/packages/SettingsLib/ActionBarShadow/Android.bp b/packages/SettingsLib/ActionBarShadow/Android.bp
index 4e147385bcda..bf4c8587722a 100644
--- a/packages/SettingsLib/ActionBarShadow/Android.bp
+++ b/packages/SettingsLib/ActionBarShadow/Android.bp
@@ -23,6 +23,7 @@ android_library {
apex_available: [
"//apex_available:platform",
"com.android.adservices",
+ "com.android.extservices",
"com.android.permission",
],
}
diff --git a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
index 7968e96009b5..b82d191fa292 100644
--- a/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
+++ b/packages/SettingsLib/CollapsingToolbarBaseActivity/Android.bp
@@ -27,6 +27,7 @@ android_library {
"//apex_available:platform",
"com.android.adservices",
"com.android.cellbroadcast",
+ "com.android.extservices",
"com.android.permission",
],
}
diff --git a/packages/SettingsLib/MainSwitchPreference/Android.bp b/packages/SettingsLib/MainSwitchPreference/Android.bp
index dd29827917da..415ae8748d60 100644
--- a/packages/SettingsLib/MainSwitchPreference/Android.bp
+++ b/packages/SettingsLib/MainSwitchPreference/Android.bp
@@ -25,5 +25,6 @@ android_library {
"//apex_available:platform",
"com.android.adservices",
"com.android.cellbroadcast",
+ "com.android.extservices",
],
}
diff --git a/packages/SettingsLib/SettingsTheme/Android.bp b/packages/SettingsLib/SettingsTheme/Android.bp
index b1eabe5b866b..d8270c4c5239 100644
--- a/packages/SettingsLib/SettingsTheme/Android.bp
+++ b/packages/SettingsLib/SettingsTheme/Android.bp
@@ -12,9 +12,7 @@ android_library {
resource_dirs: ["res"],
- static_libs: [
- "androidx.preference_preference",
- ],
+ static_libs: ["androidx.preference_preference"],
sdk_version: "system_current",
min_sdk_version: "21",
@@ -22,6 +20,7 @@ android_library {
"//apex_available:platform",
"com.android.adservices",
"com.android.cellbroadcast",
+ "com.android.extservices",
"com.android.permission",
"com.android.mediaprovider",
],
diff --git a/packages/SettingsLib/SettingsTransition/Android.bp b/packages/SettingsLib/SettingsTransition/Android.bp
index 708141b7090c..fe9dd52611ee 100644
--- a/packages/SettingsLib/SettingsTransition/Android.bp
+++ b/packages/SettingsLib/SettingsTransition/Android.bp
@@ -22,6 +22,7 @@ android_library {
"//apex_available:platform",
"com.android.adservices",
"com.android.cellbroadcast",
+ "com.android.extservices",
"com.android.permission",
],
}
diff --git a/packages/SettingsLib/Utils/Android.bp b/packages/SettingsLib/Utils/Android.bp
index 1b002613f90a..cc0f42d15145 100644
--- a/packages/SettingsLib/Utils/Android.bp
+++ b/packages/SettingsLib/Utils/Android.bp
@@ -24,7 +24,8 @@ android_library {
"//apex_available:platform",
"com.android.adservices",
- "com.android.permission",
"com.android.cellbroadcast",
+ "com.android.extservices",
+ "com.android.permission",
],
}