diff options
| author | Paul Lawrence <paullawrence@google.com> | 2015-04-28 22:13:04 +0000 |
|---|---|---|
| committer | Paul Lawrence <paullawrence@google.com> | 2015-04-28 15:34:33 -0700 |
| commit | 377cd1957172c19ee21baa3d6bda0840f1ce020d (patch) | |
| tree | a3e7406b851318e8da7bec97998a61882ff30f69 /ext4_utils/Android.mk | |
| parent | 249518de7cb7ddb1c066b3bb8b10bc0f66222f7d (diff) | |
| download | extras-377cd1957172c19ee21baa3d6bda0840f1ce020d.tar.gz | |
Securely encrypt the master key
Move all key management into vold
Reuse vold's existing key management through the crypto footer
to manage the device wide keys.
Use ro.crypto.type flag to determine crypto type, which prevents
any issues when running in block encrypted mode, as well as speeding
up boot in block or no encryption.
This is one of four changes to enable this functionality:
https://android-review.googlesource.com/#/c/148586/
https://android-review.googlesource.com/#/c/148604/
https://android-review.googlesource.com/#/c/148606/
https://android-review.googlesource.com/#/c/148607/
Bug: 18151196
Change-Id: I7a4ef3f3a937c45ff18f17c9ad1398293a8630f3
Diffstat (limited to 'ext4_utils/Android.mk')
| -rw-r--r-- | ext4_utils/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index 08088863..31a4b711 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -53,8 +53,8 @@ include $(BUILD_HOST_EXECUTABLE) # libext4_utils_src_files += \ + key_control.cpp \ ext4_crypt.cpp \ - e4crypt_static.c \ unencrypted_properties.cpp ifneq ($(HOST_OS),windows) |