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

Commit 84a10627 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Id8de5f90,Ifd046909 into main 

* changes:
  Add a java host flag library for testing
  Add API flag fsverity_api
parents dbc0b78e 65bec8d5

AconfigFlags.bp

+22 −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,24 @@ 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"],

}



java_aconfig_library {

    name: "android.security.flags-aconfig-java-host",

    aconfig_declarations: "android.security.flags-aconfig",

    host_supported: true,

    test: true,

    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"

}