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

Commit 1983f93c authored by Ellen Arteca's avatar Ellen Arteca Committed by Automerger Merge Worker
Browse files

Merge "Add a C++ library wrapper for the android.security flags" into main am:... 

Merge "Add a C++ library wrapper for the android.security flags" into main am: 64f0afd0 am: 97525370

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



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

AconfigFlags.bp

+5 −0
Original line number Diff line number Diff line
@@ -307,6 +307,11 @@ java_aconfig_library { 
    defaults: ["framework-minus-apex-aconfig-java-defaults"],

}



cc_aconfig_library {

    name: "android_security_flags_aconfig_c_lib",

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

}



// UsageStats

aconfig_declarations {

    name: "android.app.usage.flags-aconfig",