diff options
| author | Logan Chien <loganchien@google.com> | 2017-09-13 01:37:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-13 01:37:33 +0000 |
| commit | 0b06038e149d363b52a9fa5c3125a9e6870e0f7c (patch) | |
| tree | 0a03e1518de9f84f486003a4888f2b7561cd8019 /Android.mk | |
| parent | 581021037c04fb2cd8dcbfd643cd9b9545f6a2b2 (diff) | |
| parent | 8db5d07cefdae3008e19ee3fdf63b7a10d14dbff (diff) | |
| download | scrypt-0b06038e149d363b52a9fa5c3125a9e6870e0f7c.tar.gz | |
Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144
* changes:
Enable arm64 neon scrypt implementation
Mark libscrypt_static as vendor_available
Convert Android.mk to Android.bp
Fix import_scrypt.sh
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 4514f94..0000000 --- a/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -# Enable to be able to use ALOG* with #include "cutils/log.h" -#log_c_includes += system/core/include -#log_shared_libraries := liblog - -# These makefiles are here instead of being Android.mk files in the -# respective crypto, ssl, and apps directories so -# that import_openssl.sh import won't remove them. -include $(LOCAL_PATH)/build-config.mk -include $(LOCAL_PATH)/Scrypt.mk - -include $(LOCAL_PATH)/tests/Android.mk |