commit a3e47290842418ff073085bb7085bed8520e59d2
author Paul Crowley <paulcrowley@google.com> Thu Dec 06 18:09:48 2018 +0000
committer Paul Crowley <paulcrowley@google.com> Thu Dec 06 18:09:48 2018 +0000
tree 47233c251736dde3f66abcb7c7fe7a3232c7674d
parent 20f2f24d7bee098f0094ba1c6efb4935df7fa1c0

Revert "Replace the native scrypt in SyntheticPasswordManager by"

This reverts commit 20f2f24d7bee098f0094ba1c6efb4935df7fa1c0.

Reason for revert: nativeSidFromPasswordHandle is still needed

Change-Id: I02b39d8373f2e9f286d2b5f36a7fed719cbf08ef

services/core/jni/Android.bp

diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp
index 5ffcda6..b85489a 100644
--- a/services/core/jni/Android.bp
+++ b/services/core/jni/Android.bp
@@ -31,6 +31,7 @@
         "com_android_server_input_InputManagerService.cpp",
         "com_android_server_lights_LightsService.cpp",
         "com_android_server_location_GnssLocationProvider.cpp",
+        "com_android_server_locksettings_SyntheticPasswordManager.cpp",
         "com_android_server_net_NetworkStatsService.cpp",
         "com_android_server_power_PowerManagerService.cpp",
         "com_android_server_security_VerityUtils.cpp",
@@ -125,6 +126,7 @@
 
     static_libs: [
         "android.hardware.broadcastradio@common-utils-1x-lib",
+        "libscrypt_static",
     ],
 
     product_variables: {