Merge "Add container property to a couple more aconfig declarations" into main

2 files changed, 4 insertions, 1 deletions

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 3e5f1cb0e1bd..fa1127843840 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -379,6 +379,7 @@ cc_aconfig_library {
 aconfig_declarations {
     name: "com.android.internal.os.flags-aconfig",
     package: "com.android.internal.os",
+    container: "system",
     srcs: ["core/java/com/android/internal/os/flags.aconfig"],
 }
 
@@ -853,6 +854,7 @@ java_aconfig_library {
 aconfig_declarations {
     name: "com.android.server.contextualsearch.flags-aconfig",
     package: "com.android.server.contextualsearch.flags",
+    container: "system",
     srcs: ["services/contextualsearch/flags/flags.aconfig"],
 }
 
diff --git a/core/java/com/android/internal/os/flags.aconfig b/core/java/com/android/internal/os/flags.aconfig
index 4c2bbd45834e..c8d6810e274a 100644
--- a/core/java/com/android/internal/os/flags.aconfig
+++ b/core/java/com/android/internal/os/flags.aconfig
@@ -1,4 +1,5 @@
 package: "com.android.internal.os"
+container: "system"
 
 flag {
     name: "enable_apache_http_legacy_preload"
@@ -7,4 +8,4 @@ flag {
     # Fixed read-only is required as the flag is read during zygote init.
     is_fixed_read_only: true
     bug: "241474956"
-}
\ No newline at end of file
+}