tequilaOS/platform_system_security
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Set the container field of aconfig flags" into main am: 4a8dc192c3

Browse source 
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>
This commit is contained in:
Treehugger Robot 2024-02-05 22:49:06 +00:00 committed by Automerger Merge Worker
commit 71b89efc7e
4 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fsverity_init/Android.bp
View file

@ -22,12 +22,17 @@ cc_binary {
"libkeyutils", "libkeyutils",
"liblog", "liblog",
], ],
cflags: ["-Werror", "-Wall", "-Wextra"], cflags: [
"-Werror",
"-Wall",
"-Wextra",
],
} }
aconfig_declarations { aconfig_declarations {
name: "aconfig_fsverity_init", name: "aconfig_fsverity_init",
package: "android.security.flag", package: "android.security.flag",
container: "system",
srcs: ["flags.aconfig"], srcs: ["flags.aconfig"],
} }

1
fsverity_init/flags.aconfig
View file

@ -1,4 +1,5 @@
package: "android.security.flag" package: "android.security.flag"
container: "system"
flag { flag {
name: "deprecate_fsverity_init" name: "deprecate_fsverity_init"

1
keystore2/Android.bp
View file

@ -158,6 +158,7 @@ rust_binary {
aconfig_declarations { aconfig_declarations {
name: "keystore2_flags", name: "keystore2_flags",
package: "android.security.keystore2", package: "android.security.keystore2",
container: "system",
srcs: ["aconfig/flags.aconfig"], srcs: ["aconfig/flags.aconfig"],
} }

1
keystore2/aconfig/flags.aconfig
View file

@ -1,4 +1,5 @@
package: "android.security.keystore2" package: "android.security.keystore2"
container: "system"
flag { flag {
name: "wal_db_journalmode_v3" name: "wal_db_journalmode_v3"