commit 2ce97f2cd656be2ff5f39a5e30ba5a8df666d95f
author Victor Hsieh <victorhsieh@google.com> Mon Aug 21 17:20:25 2023 -0700
committer Victor Hsieh <victorhsieh@google.com> Fri Aug 25 11:27:39 2023 -0700
tree 852d90a318f828c050751dfff8a51cc390e90420
parent 242674523021aaea13f5cb87a496ebb03dff8c69

Add API flag fsverity_api

Bug: 285185747
Test: use the flag
Change-Id: Ifd046909dfca3155d6f95dd86f0d990636f4cbb2

AconfigFlags.bp

diff --git a/AconfigFlags.bp b/AconfigFlags.bp
index 34a6215..e394857 100644
--- a/AconfigFlags.bp
+++ b/AconfigFlags.bp
@@ -18,6 +18,7 @@
 
     // Add java_aconfig_libraries to here to add them to the core framework
     srcs: [
+        ":android.security.flags-aconfig-java{.generated_srcjars}",
         ":com.android.hardware.camera2-aconfig-java{.generated_srcjars}",
         ":com.android.window.flags.window-aconfig-java{.generated_srcjars}",
         ":com.android.text.flags-aconfig-java{.generated_srcjars}",
@@ -70,3 +71,16 @@
     aconfig_declarations: "com.android.text.flags-aconfig",
     defaults: ["framework-minus-apex-aconfig-java-defaults"],
 }
+
+// Security
+aconfig_declarations {
+    name: "android.security.flags-aconfig",
+    package: "android.security",
+    srcs: ["core/java/android/security/*.aconfig"],
+}
+
+java_aconfig_library {
+    name: "android.security.flags-aconfig-java",
+    aconfig_declarations: "android.security.flags-aconfig",
+    defaults: ["framework-minus-apex-aconfig-java-defaults"],
+}

core/java/android/security/flags.aconfig

diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig
new file mode 100644
index 0000000..b27dac2
--- /dev/null
+++ b/core/java/android/security/flags.aconfig
@@ -0,0 +1,8 @@
+package: "android.security"
+
+flag {
+    name: "fsverity_api"
+    namespace: "hardware_backed_security"
+    description: "Feature flag for fs-verity API"
+    bug: "285185747"
+}