Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92bc28b7 authored by Victor Hsieh's avatar Victor Hsieh Committed by Automerger Merge Worker
Browse files

Add API flag fsverity_api am: 529c1a73 am: ebc7b493 am: 556461ff am: ed9460a4 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2736476



Change-Id: I2b7d33aaf9bed61496c4e52e18eeba1b35117cd3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eebaf4b2 ed9460a4

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -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}",
@@ -72,3 +73,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"],

}

core/java/android/security/flags.aconfig

0 → 100644
+8 −0
Original line number Diff line number Diff line 
package: "android.security"



flag {

    name: "fsverity_api"

    namespace: "hardware_backed_security"

    description: "Feature flag for fs-verity API"

    bug: "285185747"

}