diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2014-09-19 09:43:41 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2014-09-19 09:43:41 +0200 |
| commit | 535b2ec3a4b34bbe3b5560baf6019a3e34d9c982 (patch) | |
| tree | 5a71ac766787e3fefc0ec04adad3a040e3c22452 /main/openssl/Crypto.mk | |
| parent | 74304c02f4e6a89a896e0bc4832d9ebb6f2413d6 (diff) | |
Sync OpenSSL with AOSP
Diffstat (limited to 'main/openssl/Crypto.mk')
| -rw-r--r-- | main/openssl/Crypto.mk | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/main/openssl/Crypto.mk b/main/openssl/Crypto.mk index 6565f97c..621627bf 100644 --- a/main/openssl/Crypto.mk +++ b/main/openssl/Crypto.mk @@ -3,6 +3,7 @@ include $(CLEAR_VARS) include $(LOCAL_PATH)/ndk-build-clear.mk LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +LOCAL_C_INCLUDES := $(log_c_includes) # The static library should be used in only unbundled apps # and we don't have clang in unbundled build yet. @@ -25,6 +26,7 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) include $(LOCAL_PATH)/ndk-build-clear.mk LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +LOCAL_C_INCLUDES := $(log_c_includes) # 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 @@ -50,22 +52,25 @@ include $(BUILD_SHARED_LIBRARY) ####################################### # host shared library -#include $(CLEAR_VARS) -#LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -#LOCAL_CFLAGS += -DPURIFY -#LOCAL_LDLIBS += -ldl -#LOCAL_MODULE_TAGS := optional -#LOCAL_MODULE := libcrypto-host -#LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk -#include $(LOCAL_PATH)/Crypto-config-host.mk -#include $(LOCAL_PATH)/android-config.mk -#include $(BUILD_HOST_SHARED_LIBRARY) +# include $(CLEAR_VARS) +# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +# LOCAL_C_INCLUDES := $(log_c_includes) +# LOCAL_CFLAGS += -DPURIFY +# LOCAL_LDLIBS += -ldl +# LOCAL_MODULE_TAGS := optional +# LOCAL_MODULE := libcrypto-host +# LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Crypto.mk +# LOCAL_MULTILIB := both +# include $(LOCAL_PATH)/Crypto-config-host.mk +# include $(LOCAL_PATH)/android-config.mk +# include $(BUILD_HOST_SHARED_LIBRARY) ######################################## # host static library, which is used by some SDK tools. # include $(CLEAR_VARS) # LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +# LOCAL_C_INCLUDES := $(log_c_includes) # LOCAL_CFLAGS += -DPURIFY # LOCAL_LDLIBS += -ldl # LOCAL_MODULE_TAGS := optional @@ -74,4 +79,3 @@ include $(BUILD_SHARED_LIBRARY) # include $(LOCAL_PATH)/Crypto-config-host.mk # include $(LOCAL_PATH)/android-config.mk # include $(BUILD_HOST_STATIC_LIBRARY) - |