commit aedee5d1ac2d1e069341912df98450f9f992ddef
author Janis Danisevskis <jdanis@google.com> Mon Mar 15 15:54:50 2021 -0700
committer Janis Danisevskis <jdanis@google.com> Mon Mar 22 18:24:56 2021 +0000
tree feee6bf463ffeb9cbf50f6566a0742618eef54bf
parent 053a0187f76cb8328322a6f86963169b36536ab1

Keystore 2.0: Build java sources for AIDL interfaces.

Builds java sources to be used as source by frameworks rather than
building libraries, which would lead to cirular dependencies when using
@SensitiveData annotation.

Bug: 176110256
But: 174860535
Test: N/A
Merged-In: I8178d185f04983a5089bba14ba0f0c595808a7a6
Change-Id: I8178d185f04983a5089bba14ba0f0c595808a7a6

keystore2/aidl/Android.bp

diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp
index 69ba0b4..183096c 100644
--- a/keystore2/aidl/Android.bp
+++ b/keystore2/aidl/Android.bp
@@ -28,7 +28,8 @@
     unstable: true,
     backend: {
         java: {
-            sdk_version: "module_current",
+            platform_apis: true,
+            srcs_available: true,
         },
         rust: {
             enabled: true,
@@ -46,7 +47,8 @@
     unstable: true,
     backend: {
         java: {
-            sdk_version: "module_current",
+            platform_apis: true,
+            srcs_available: true,
         },
         rust: {
             enabled: true,
@@ -64,6 +66,7 @@
     backend: {
         java: {
             enabled: true,
+            srcs_available: true,
         },
         rust: {
             enabled: true,
@@ -82,7 +85,8 @@
     unstable: true,
     backend: {
         java: {
-            sdk_version: "module_current",
+            platform_apis: true,
+            srcs_available: true,
         },
         rust: {
             enabled: true,
@@ -102,9 +106,8 @@
     unstable: true,
     backend: {
         java: {
-            enabled: true,
-            sdk_version: "module_current",
             platform_apis: true,
+            srcs_available: true,
         },
         ndk: {
             enabled: true,
@@ -124,7 +127,8 @@
     unstable: true,
     backend: {
         java: {
-            sdk_version: "module_current",
+            platform_apis: true,
+            srcs_available: true,
         },
         rust: {
             enabled: true,
@@ -141,7 +145,8 @@
     unstable: true,
     backend: {
         java: {
-            sdk_version: "module_current",
+            platform_apis: true,
+            srcs_available: true,
         },
         rust: {
             enabled: true,