commit 2e323bd17073bd2bb938ddf8b656015197b2f6ff
author Janis Danisevskis <jdanis@google.com> Wed Apr 07 22:55:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Apr 07 22:55:04 2021 +0000
tree 11b709615089dca08eefb145a7a0a5250cecb928
parent ba5652863e9d589202093ff2f1c5adf726db23dc
parent 8ec84b332bb96bcaf6b8f9bdc8f9bafceec5284f

Merge "Keystore 2.0: Sensitive data annotation." am: 8ec84b332b

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1665679

Change-Id: I2169bac0fbe1ad292cadf688480279ce6afbaea6

keystore2/aidl/Android.bp

diff --git a/keystore2/aidl/Android.bp b/keystore2/aidl/Android.bp
index 9828bd0..06fdb48 100644
--- a/keystore2/aidl/Android.bp
+++ b/keystore2/aidl/Android.bp
@@ -34,6 +34,10 @@
         rust: {
             enabled: true,
         },
+        ndk: {
+            enabled: true,
+            apps_enabled: false,
+        }
     },
 }
 
@@ -98,7 +102,7 @@
         ndk: {
             enabled: true,
             apps_enabled: false,
-        }
+        },
     },
 }
 
@@ -116,6 +120,7 @@
         },
         ndk: {
             enabled: true,
+            apps_enabled: false,
         },
         rust: {
             enabled: true,