diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-05-01 21:37:56 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-05-02 09:47:17 -0700 |
| commit | 271d3cf9a372d0e745b55434a0ae83624e0c5ad4 (patch) | |
| tree | 5189e8b8d5f8346fb559448704157262bc5dad39 | |
| parent | 4d2199ecb112f77bd1897047a75277c1d43d1aa9 (diff) | |
| download | replicant_openssl-271d3cf9a372d0e745b55434a0ae83624e0c5ad4.zip replicant_openssl-271d3cf9a372d0e745b55434a0ae83624e0c5ad4.tar.gz replicant_openssl-271d3cf9a372d0e745b55434a0ae83624e0c5ad4.tar.bz2 | |
Give unique name to host build shared libraries
(cherry picked from commit 32e8f93ccd0aad87b5570b88f3ce5f1ea7530be3)
Change-Id: I63d341a0bd2ea502e617e6bb6aee4ad6fb72a06f
| -rw-r--r-- | Apps.mk | 8 | ||||
| -rw-r--r-- | Crypto.mk | 2 | ||||
| -rw-r--r-- | Ssl.mk | 4 |
3 files changed, 5 insertions, 9 deletions
@@ -2,10 +2,6 @@ LOCAL_PATH:= $(call my-dir) -local_shared_libraries := \ - libssl \ - libcrypto - local_c_includes := local_c_flags := @@ -17,7 +13,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= openssl LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(target_src_files) -LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) +LOCAL_SHARED_LIBRARIES := libssl libcrypto LOCAL_C_INCLUDES := $(target_c_includes) LOCAL_CFLAGS := $(target_c_flags) LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) @@ -28,7 +24,7 @@ include $(CLEAR_VARS) LOCAL_MODULE:= openssl LOCAL_MODULE_TAGS := optional LOCAL_SRC_FILES := $(host_src_files) -LOCAL_SHARED_LIBRARIES := $(local_shared_libraries) +LOCAL_SHARED_LIBRARIES := libssl-host libcrypto-host LOCAL_C_INCLUDES := $(host_c_includes) LOCAL_CFLAGS := $(host_c_flags) LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) @@ -55,7 +55,7 @@ LOCAL_CFLAGS += $(host_c_flags) -DPURIFY LOCAL_C_INCLUDES += $(host_c_includes) LOCAL_LDLIBS += -ldl LOCAL_MODULE_TAGS := optional -LOCAL_MODULE:= libcrypto +LOCAL_MODULE:= libcrypto-host LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) include $(BUILD_HOST_SHARED_LIBRARY) @@ -49,9 +49,9 @@ include $(LOCAL_PATH)/android-config.mk LOCAL_SRC_FILES += $(host_src_files) LOCAL_CFLAGS += $(host_c_flags) LOCAL_C_INCLUDES += $(host_c_includes) -LOCAL_SHARED_LIBRARIES += libcrypto $(log_shared_libraries) +LOCAL_SHARED_LIBRARIES += libcrypto-host $(log_shared_libraries) LOCAL_MODULE_TAGS := optional -LOCAL_MODULE:= libssl +LOCAL_MODULE:= libssl-host LOCAL_ADDITIONAL_DEPENDENCIES := $(local_additional_dependencies) include $(BUILD_HOST_SHARED_LIBRARY) |