commit 09856135e35c069bab58e7487ccfc733b9a6811c
author Bo Zhu <bozhu@google.com> Sun Apr 01 12:24:09 2018 -0700
committer Bo Zhu <bozhu@google.com> Mon Apr 02 15:47:08 2018 -0700
tree 2a59302bdd6e47b71369b624ea9b8dbe43e00315
parent 03061a79032f681ef76768a8ebce344d99e74bde

Expose the JNI scrypt function in a standalone Java class so we can
use it in RecoverableKeyStore as well

Bug: 77325751
Test: It builds. No caller code yet.

Change-Id: I6ff847cff2efbd023612e51fe35be980f27f162d

core/jni/Android.bp

diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 1d22093..302189f 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -195,6 +195,7 @@
         "android_content_res_ObbScanner.cpp",
         "android_content_res_Configuration.cpp",
         "android_animation_PropertyValuesHolder.cpp",
+        "android_security_Scrypt.cpp",
         "com_android_internal_net_NetworkStatsFactory.cpp",
         "com_android_internal_os_ClassLoaderFactory.cpp",
         "com_android_internal_os_FuseAppLoop.cpp",
@@ -228,6 +229,7 @@
         "libseccomp_policy",
         "libselinux",
         "libgrallocusage",
+        "libscrypt_static",
     ],
 
     shared_libs: [