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

Commit 414e5d83 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Merge "Use source for keystore/keymint interfaces." into sc-dev am: c0a2fc8e 

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

Change-Id: Id2e1c136844e41f7c6c4845243097435d6bf64cc
parents d658b493 c0a2fc8e

Android.bp

+7 −5
Original line number Diff line number Diff line
@@ -401,6 +401,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",
@@ -582,11 +589,6 @@ java_library { 
        "android.hardware.vibrator-V1.2-java",

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

        "android.hardware.vibrator-V2-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",