From 2ce97f2cd656be2ff5f39a5e30ba5a8df666d95f Mon Sep 17 00:00:00 2001 From: Victor Hsieh Date: Mon, 21 Aug 2023 17:20:25 -0700 Subject: Add API flag fsverity_api Bug: 285185747 Test: use the flag Change-Id: Ifd046909dfca3155d6f95dd86f0d990636f4cbb2 --- AconfigFlags.bp | 14 ++++++++++++++ core/java/android/security/flags.aconfig | 8 ++++++++ 2 files changed, 22 insertions(+) create mode 100644 core/java/android/security/flags.aconfig diff --git a/AconfigFlags.bp b/AconfigFlags.bp index 34a62152487d..e394857795cf 100644 --- a/AconfigFlags.bp +++ b/AconfigFlags.bp @@ -18,6 +18,7 @@ java_defaults { // 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 @@ java_aconfig_library { 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"], +} diff --git a/core/java/android/security/flags.aconfig b/core/java/android/security/flags.aconfig new file mode 100644 index 000000000000..b27dac2de6af --- /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" +} -- cgit v1.2.3-59-g8ed1b