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/Ssl.mk | |
| parent | 74304c02f4e6a89a896e0bc4832d9ebb6f2413d6 (diff) | |
Sync OpenSSL with AOSP
Diffstat (limited to 'main/openssl/Ssl.mk')
| -rw-r--r-- | main/openssl/Ssl.mk | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/main/openssl/Ssl.mk b/main/openssl/Ssl.mk index 6c04950a..0cb93eac 100644 --- a/main/openssl/Ssl.mk +++ b/main/openssl/Ssl.mk @@ -3,6 +3,9 @@ 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. LOCAL_SDK_VERSION := 9 @@ -10,7 +13,6 @@ LOCAL_SDK_VERSION := 9 LOCAL_SRC_FILES += $(target_src_files) LOCAL_CFLAGS += $(target_c_flags) LOCAL_C_INCLUDES += $(target_c_includes) -LOCAL_SHARED_LIBRARIES = $(log_shared_libraries) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libssl_static LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk @@ -23,6 +25,8 @@ include $(BUILD_STATIC_LIBRARY) # target shared 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 @@ -33,7 +37,7 @@ else LOCAL_SDK_VERSION := 9 endif -LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries) +LOCAL_SHARED_LIBRARIES += libcrypto LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libssl LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk @@ -46,9 +50,13 @@ include $(BUILD_SHARED_LIBRARY) # ####################################### # # host shared library # include $(CLEAR_VARS) -# LOCAL_SHARED_LIBRARIES += libcrypto-host $(log_shared_libraries) +# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +# LOCAL_C_INCLUDES := $(log_c_includes) + +# LOCAL_SHARED_LIBRARIES += libcrypto-host # LOCAL_MODULE_TAGS := optional # LOCAL_MODULE := libssl-host +# LOCAL_MULTILIB := both # LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/android-config.mk $(LOCAL_PATH)/Ssl.mk # include $(LOCAL_PATH)/Ssl-config-host.mk # include $(LOCAL_PATH)/android-config.mk @@ -57,8 +65,11 @@ include $(BUILD_SHARED_LIBRARY) # ####################################### # # ssltest # include $(CLEAR_VARS) +# LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) +# LOCAL_C_INCLUDES := $(log_c_includes) + # LOCAL_SRC_FILES := ssl/ssltest.c -# LOCAL_SHARED_LIBRARIES := libssl libcrypto $(log_shared_libraries) +# LOCAL_SHARED_LIBRARIES := libssl libcrypto # LOCAL_MODULE := ssltest # LOCAL_MULTILIB := both # LOCAL_MODULE_STEM_32 := ssltest |