diff options
| author | Janis Danisevskis <jdanis@google.com> | 2021-03-17 11:02:19 -0700 |
|---|---|---|
| committer | Janis Danisevskis <jdanis@google.com> | 2021-03-22 18:26:16 +0000 |
| commit | 15212609ca795b9a2f24cddded181eba0a1a2cda (patch) | |
| tree | 1bba3fb4a61fadb1d1c5a730b9435dbdf50afcbb | |
| parent | 2fea6f3f774dc38d7a1e98eba0493f67b89782b4 (diff) | |
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
Merged-In: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
Change-Id: Ia7fc2403cfe6dece86ed0ab9d6f415be2a2726b8
| -rw-r--r-- | Android.bp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index d40f11598553..c9ed7ede26ba 100644 --- a/Android.bp +++ b/Android.bp @@ -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", |