Use system_ext as the container of the aconfig flags in Settings
Bug: 332723689
Test: Run `adb shell printflags` and verify the flags defined in aconfig
folders show up
Flags: EXEMPT aconfig file only changes
Change-Id: If0b497117c303a0bd0b366819c90bd11b41232c3
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index f7b4881..549ccc7 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -20,7 +20,7 @@
aconfig_declarations {
name: "factory_reset_flags",
package: "com.android.settings.factory_reset",
- container: "system",
+ container: "system_ext",
srcs: ["factory_reset/*.aconfig"],
}
@@ -32,7 +32,7 @@
aconfig_declarations {
name: "media_drm_flags",
package: "com.android.settings.media_drm",
- container: "system",
+ container: "system_ext",
srcs: ["media_drm/*.aconfig"],
}
@@ -44,7 +44,7 @@
aconfig_declarations {
name: "accessibility_flags",
package: "com.android.settings.accessibility",
- container: "system",
+ container: "system_ext",
srcs: ["accessibility/*.aconfig"],
}
@@ -56,7 +56,7 @@
aconfig_declarations {
name: "development_settings_flags",
package: "com.android.settings.development",
- container: "system",
+ container: "system_ext",
srcs: [
"development/**/*.aconfig",
],
diff --git a/aconfig/accessibility/accessibility_flags.aconfig b/aconfig/accessibility/accessibility_flags.aconfig
index 6919990..c9e1ece 100644
--- a/aconfig/accessibility/accessibility_flags.aconfig
+++ b/aconfig/accessibility/accessibility_flags.aconfig
@@ -1,5 +1,5 @@
package: "com.android.settings.accessibility"
-container: "system"
+container: "system_ext"
# NOTE: Keep alphabetized to help limit merge conflicts from multiple simultaneous editors.
diff --git a/aconfig/development/settings_core_flag_declarations.aconfig b/aconfig/development/settings_core_flag_declarations.aconfig
index fec67f6..8a6b055 100644
--- a/aconfig/development/settings_core_flag_declarations.aconfig
+++ b/aconfig/development/settings_core_flag_declarations.aconfig
@@ -1,5 +1,5 @@
package: "com.android.settings.development"
-container: "system"
+container: "system_ext"
flag {
name: "a2dp_offload_codec_extensibility_settings"
diff --git a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
index 7feebf5..dc7d8d4 100644
--- a/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
+++ b/aconfig/factory_reset/factory_reset_flag_declarations.aconfig
@@ -1,5 +1,5 @@
package: "com.android.settings.factory_reset"
-container: "system"
+container: "system_ext"
flag {
name: "enable_factory_reset_wizard"
diff --git a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
index 4697a11..10579eb 100644
--- a/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
+++ b/aconfig/media_drm/settings_mediadrm_flag_declarations.aconfig
@@ -1,9 +1,9 @@
package: "com.android.settings.media_drm"
-container: "system"
+container: "system_ext"
flag {
name: "force_l3_enabled"
namespace: "media_drm"
description: "Feature flag of forcing L3"
bug: "301669353"
-}
\ No newline at end of file
+}