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

Commit be33868c authored by Sandro Montanari's avatar Sandro Montanari Committed by Automerger Merge Worker
Browse files

Merge "Add android.security.flags-aconfig-java-export target" into main am: 21cd97b5 

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



Change-Id: Ic2605b0d0a65fdaa193f919a8d0757d479818b82
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14174386 21cd97b5

AconfigFlags.bp

+14 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ java_aconfig_library { 
aconfig_declarations {

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

    package: "android.security",

    exportable: true,

    container: "system",

    srcs: ["core/java/android/security/*.aconfig"],

}
@@ -342,6 +343,19 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



java_aconfig_library {

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

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

    mode: "exported",

    min_sdk_version: "30",

    apex_available: [

        "//apex_available:platform",

        "com.android.tethering",

        "com.android.wifi",

    ],

    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android_security_flags_aconfig_c_lib",

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