diff options
author | Adam Langley <agl@google.com> | 2015-01-22 17:10:41 -0800 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2015-01-22 17:10:41 -0800 |
commit | 4927576f7fe8a31881dd01fe64aa350166890f99 (patch) | |
tree | 9b260c835d9b9fd7e3a37c69464850469874523f | |
parent | 0306c7856fa4889c859ad6f4e56657afc553bf04 (diff) | |
download | scrypt-4927576f7fe8a31881dd01fe64aa350166890f99.tar.gz |
Remove OpenSSL include paths.
The libcrypto and libssl modules (and their respective static and host
versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module
is sufficient.
Change-Id: I1bc36094ecbc4ed2d9a4c62498f05580770f4a8a
-rw-r--r-- | Scrypt.mk | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -1,6 +1,6 @@ local_c_flags := -DUSE_OPENSSL_PBKDF2 -local_c_includes := $(log_c_includes) external/openssl/include +local_c_includes := $(log_c_includes) local_additional_dependencies := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Scrypt.mk @@ -11,7 +11,7 @@ include $(LOCAL_PATH)/Scrypt-config.mk include $(CLEAR_VARS) include $(LOCAL_PATH)/android-config.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) libcrypto # If we're building an unbundled build, don't try to use clang since it's not # in the NDK yet. This can be removed when a clang version that is fast enough @@ -35,7 +35,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) include $(LOCAL_PATH)/android-config.mk -LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) libcrypto-host LOCAL_SRC_FILES += $(host_src_files) LOCAL_CFLAGS += $(host_c_flags) LOCAL_C_INCLUDES += $(host_c_includes) |