commit 2390267db89b6d47c1512283e1105ff7c6619a4b
author Janis Danisevskis <jdanis@google.com> Wed Mar 17 11:02:19 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Sat Mar 20 20:36:03 2021 -0700
tree 96836622fce280a50f1847bf98fa9bf1e8dcf3cd
parent 19d042f7b974b9b56f5d15ff05d95f285d038631

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

Android.bp

diff --git a/Android.bp b/Android.bp
index ee5e992..924371c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -401,6 +401,13 @@
         ":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 @@
         "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",