Break vold dependency on keystore utilities.
This is temporary. Keystore is in the process of being upgraded to use
the new Keymaster 4.0 HAL, and I want to leave vold alone, using
Keymaster 3.0 for the moment. This CL just copies relevant bits of
keystore support utilities into vold, so it can stop depending on the
copies from keystore.
After the keystore update is complete, vold will be changed either to
use Keymaster 4.0 or -- more likely -- to use keystore rather than
talking to Keymaster directly. At that point the files added by this CL
will be deleted.
Test: Device boots and successfully decrypts /data
Change-Id: I73f6d4cc4c5e20d89d7ac37d29d025bf279f9e12
diff --git a/Android.bp b/Android.bp
index 5941cd9..cc015bf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -50,7 +50,6 @@
"libhardware_legacy",
"libhidlbase",
"libhwbinder",
- "libkeystore_binder",
"libkeyutils",
"liblog",
"liblogwrap",
@@ -111,6 +110,7 @@
"VoldNativeService.cpp",
"VoldUtil.cpp",
"VolumeManager.cpp",
+ "authorization_set.cpp",
"cryptfs.cpp",
"fs/Ext4.cpp",
"fs/F2fs.cpp",