summaryrefslogtreecommitdiff
path: root/android-config.mk
diff options
context:
space:
mode:
authorLogan Chien <loganchien@google.com>2017-09-13 21:49:57 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-09-13 21:49:57 +0000
commit62f9d716cd7019cfc6db72bf0abd2a00cede745e (patch)
tree0a03e1518de9f84f486003a4888f2b7561cd8019 /android-config.mk
parent9af45b854438aa16933227eae3957d6653286beb (diff)
parent0b06038e149d363b52a9fa5c3125a9e6870e0f7c (diff)
downloadscrypt-62f9d716cd7019cfc6db72bf0abd2a00cede745e.tar.gz
Merge changes If40a3037,I06bcc80c,I8e901b0b,I843a2144
am: 0b06038e14 Change-Id: If19509c6c81b2e57c7e51f838390de150998ff29
Diffstat (limited to 'android-config.mk')
-rw-r--r--android-config.mk16
1 files changed, 0 insertions, 16 deletions
diff --git a/android-config.mk b/android-config.mk
deleted file mode 100644
index 326e113..0000000
--- a/android-config.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# These flags represent the build-time configuration of scrypt for Android
-#
-# The value of $(scrypt_cflags) was pruned from the Makefile generated
-# by running ./configure from import_scrypt.sh.
-#
-# This script performs minor but required patching for the Android build.
-#
-
-LOCAL_CFLAGS += $(scrypt_cflags)
-
-# Add in flags to let config.h be read properly
-LOCAL_CFLAGS += "-DHAVE_CONFIG_H"
-
-# Add clang here when it works on host
-# LOCAL_CLANG := true