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

Commit 2390267d authored by Janis Danisevskis's avatar Janis Danisevskis
Browse files

Use source for keystore/keymint interfaces. 

This patch makes frameworks use generated sources instead of libraries
for keystore, keymint and related interfaces and dependencies to break
circular build system dependencies occuring when using @SensitiveData
annotations.

Bug: 174857732
Bug: 176110256
Test: N/A
Change-Id: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
parent 19d042f7

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",

        "cameraprotosnano",

        "devicepolicyprotosnano",