From 85d84ff9ed4a9cd19e6f6d76d8463921f07a155b Mon Sep 17 00:00:00 2001
From: Oriol Prieto Gasco <opg@google.com>
Date: Sat, 3 Feb 2024 02:39:40 +0000
Subject: [PATCH] Set the container field of aconfig flags

Test: m
Bug: 312769710
Change-Id: I366717c7139886e30360914256ad7710da5095e9
---
 fsverity_init/Android.bp        | 7 ++++++-
 fsverity_init/flags.aconfig     | 1 +
 keystore2/Android.bp            | 1 +
 keystore2/aconfig/flags.aconfig | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/fsverity_init/Android.bp b/fsverity_init/Android.bp
index d9bff3b2..55884937 100644
--- a/fsverity_init/Android.bp
+++ b/fsverity_init/Android.bp
@@ -22,12 +22,17 @@ cc_binary {
         "libkeyutils",
         "liblog",
     ],
-    cflags: ["-Werror", "-Wall", "-Wextra"],
+    cflags: [
+        "-Werror",
+        "-Wall",
+        "-Wextra",
+    ],
 }
 
 aconfig_declarations {
     name: "aconfig_fsverity_init",
     package: "android.security.flag",
+    container: "system",
     srcs: ["flags.aconfig"],
 }
 
diff --git a/fsverity_init/flags.aconfig b/fsverity_init/flags.aconfig
index 20640d7e..495c71c4 100644
--- a/fsverity_init/flags.aconfig
+++ b/fsverity_init/flags.aconfig
@@ -1,4 +1,5 @@
 package: "android.security.flag"
+container: "system"
 
 flag {
     name: "deprecate_fsverity_init"
diff --git a/keystore2/Android.bp b/keystore2/Android.bp
index ad151ad1..7cb7c37a 100644
--- a/keystore2/Android.bp
+++ b/keystore2/Android.bp
@@ -158,6 +158,7 @@ rust_binary {
 aconfig_declarations {
     name: "keystore2_flags",
     package: "android.security.keystore2",
+    container: "system",
     srcs: ["aconfig/flags.aconfig"],
 }
 
diff --git a/keystore2/aconfig/flags.aconfig b/keystore2/aconfig/flags.aconfig
index 133c4abe..b67bc6cb 100644
--- a/keystore2/aconfig/flags.aconfig
+++ b/keystore2/aconfig/flags.aconfig
@@ -1,4 +1,5 @@
 package: "android.security.keystore2"
+container: "system"
 
 flag {
   name: "wal_db_journalmode_v3"