diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-02-05 22:49:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-02-05 22:49:06 +0000 |
| commit | 71b89efc7e3463ec2e36a7568029897742751255 (patch) | |
| tree | 28bf37e760e4b5bba6d1b375a9313bea92b8b6c9 | |
| parent | 92296495c52396b46e7a9974ecf1aaed3d0dedd5 (diff) | |
| parent | 4a8dc192c3badbaa2a0b8e2a06729383fe431f16 (diff) | |
| download | security-71b89efc7e3463ec2e36a7568029897742751255.tar.gz | |
Merge "Set the container field of aconfig flags" into main am: 4a8dc192c3
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2947640
Change-Id: I6e23ceb71a2c696a764a72ad922c50c316c957c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | fsverity_init/Android.bp | 7 | ||||
| -rw-r--r-- | fsverity_init/flags.aconfig | 1 | ||||
| -rw-r--r-- | keystore2/Android.bp | 1 | ||||
| -rw-r--r-- | keystore2/aconfig/flags.aconfig | 1 |
4 files changed, 9 insertions, 1 deletions
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" |