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

Commit 06f704f5 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Id8de5f90,Ifd046909 into main am: 84a10627 

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



Change-Id: I7c6e85d3b046a88f3f7d9dbb7ab51e8599c532e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ebc7b493 84a10627

AconfigFlags.bp

+8 −0
Original line number Diff line number Diff line
@@ -86,3 +86,11 @@ java_aconfig_library { 
    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"],

}