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

Commit 4ea150e1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use source for keystore/keymint interfaces." am: 8d79d282 

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

Change-Id: I20042d327151ef154fc8d431f3ff00b5e02dec10
parents a1a58daa 8d79d282

Android.bp

+7 −5
Original line number Diff line number Diff line
@@ -363,6 +363,13 @@ filegroup { 
        ":platform-compat-native-aidl",



        // AIDL sources from external directories

        ":android.hardware.security.keymint-V1-java-source",

        ":android.hardware.security.secureclock-V1-java-source",

        ":android.security.apc-java-source",

        ":android.security.authorization-java-source",

        ":android.security.maintenance-java-source",

        ":android.security.vpnprofilestore-java-source",

        ":android.system.keystore2-V1-java-source",

        ":credstore_aidl",

        ":dumpstate_aidl",

        ":framework_native_aidl",
@@ -523,11 +530,6 @@ java_library { 
        "android.hardware.vibrator-V1.1-java",

        "android.hardware.vibrator-V1.2-java",

        "android.hardware.vibrator-V1.3-java",

        "android.security.apc-java",

        "android.security.authorization-java",

        "android.security.maintenance-java",

        "android.security.vpnprofilestore-java",

        "android.system.keystore2-V1-java",

        "android.system.suspend.control.internal-java",

        "devicepolicyprotosnano",