summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dennis Shen <dzshen@google.com> 2024-04-04 12:40:08 +0000
committer Dennis Shen <dzshen@google.com> 2024-04-04 12:40:08 +0000
commit38147a35914222685d1dd207fc1bcd676eb23f01 (patch)
treef8c536ebef2742359cc0cac25445672f53b91110
parent443b3c6fd2b0919434e7f6eaf56ae99d8eda63f1 (diff)
set container for aconfig package
Bug: 330354107 Test: CI Flag: NONE Ignore-AOSP-First: It is easier to detect all the mismatch in internal master. Change-Id: Ie52c00f15ab65fb1203fa52febd6259b9954f59c
-rw-r--r--packages/SettingsLib/Android.bp2
-rw-r--r--packages/SettingsLib/aconfig/settingslib.aconfig1
-rw-r--r--packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig1
3 files changed, 4 insertions, 0 deletions
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index 66fad3689eac..6f3207216175 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -88,6 +88,7 @@ java_defaults {
aconfig_declarations {
name: "settingslib_media_flags",
package: "com.android.settingslib.media.flags",
+ container: "system",
srcs: [
"aconfig/settingslib_media_flag_declarations.aconfig",
],
@@ -101,6 +102,7 @@ java_aconfig_library {
aconfig_declarations {
name: "settingslib_flags",
package: "com.android.settingslib.flags",
+ container: "system",
srcs: [
"aconfig/settingslib.aconfig",
],
diff --git a/packages/SettingsLib/aconfig/settingslib.aconfig b/packages/SettingsLib/aconfig/settingslib.aconfig
index 54c5a14702f6..e09ab0086451 100644
--- a/packages/SettingsLib/aconfig/settingslib.aconfig
+++ b/packages/SettingsLib/aconfig/settingslib.aconfig
@@ -1,4 +1,5 @@
package: "com.android.settingslib.flags"
+container: "system"
flag {
name: "new_status_bar_icons"
diff --git a/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig b/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig
index f3e537b33230..4d70aec9fa5c 100644
--- a/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig
+++ b/packages/SettingsLib/aconfig/settingslib_media_flag_declarations.aconfig
@@ -1,4 +1,5 @@
package: "com.android.settingslib.media.flags"
+container: "system"
flag {
name: "use_media_router2_for_info_media_manager"