Revert "Replace system_ext container with system"
This reverts commit 6e1b274f03cab386f39c7d7c0b0487b4dcad6af3.
A system partition cannot have the aconfigs of other partitions.
Revive the system_ext container for system_ext aconfigs.
Bug: 385213580
Test: "adb shell aflags list" must not be changed.
Flag: EXEMPT refactor
Change-Id: I8f52d5f86e6ffaccd624846fbe1ba0a8fc842af6
diff --git a/aconfig/Android.bp b/aconfig/Android.bp
index 6d62dcf..cdc8435 100644
--- a/aconfig/Android.bp
+++ b/aconfig/Android.bp
@@ -6,7 +6,7 @@
aconfig_declarations {
name: "aconfig_settings_flags",
package: "com.android.settings.flags",
- container: "system",
+ container: "system_ext",
srcs: [
"*.aconfig",
"catalyst/*.aconfig",
@@ -21,7 +21,7 @@
aconfig_declarations {
name: "factory_reset_flags",
package: "com.android.settings.factory_reset",
- container: "system",
+ container: "system_ext",
srcs: ["factory_reset/*.aconfig"],
}
@@ -33,7 +33,7 @@
aconfig_declarations {
name: "media_drm_flags",
package: "com.android.settings.media_drm",
- container: "system",
+ container: "system_ext",
srcs: ["media_drm/*.aconfig"],
}
@@ -45,7 +45,7 @@
aconfig_declarations {
name: "accessibility_flags",
package: "com.android.settings.accessibility",
- container: "system",
+ container: "system_ext",
srcs: ["accessibility/*.aconfig"],
}
@@ -57,7 +57,7 @@
aconfig_declarations {
name: "development_settings_flags",
package: "com.android.settings.development",
- container: "system",
+ container: "system_ext",
srcs: [
"development/**/*.aconfig",
],
@@ -71,7 +71,7 @@
aconfig_declarations {
name: "keyboard_flags",
package: "com.android.settings.keyboard",
- container: "system",
+ container: "system_ext",
srcs: ["keyboard/*.aconfig"],
}