diff options
| author | Kenny Root <kroot@google.com> | 2013-06-10 17:06:06 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-10 17:06:06 -0700 |
| commit | d1175680fa9036ea776aaa4134b337e4c57c5b79 (patch) | |
| tree | a8b99f86bf9f527b2694623b43e7c50eeabc5893 | |
| parent | 0306b8084ff855932f3bde69401bf1bbe3241b94 (diff) | |
| parent | a417d05adc329e0cda1768aed67f207bc4168998 (diff) | |
| download | replicant_openssl-d1175680fa9036ea776aaa4134b337e4c57c5b79.zip replicant_openssl-d1175680fa9036ea776aaa4134b337e4c57c5b79.tar.gz replicant_openssl-d1175680fa9036ea776aaa4134b337e4c57c5b79.tar.bz2 | |
am a417d05a: Merge "Don\'t use clang for unbundled build target"
* commit 'a417d05adc329e0cda1768aed67f207bc4168998':
Don't use clang for unbundled build target
| -rw-r--r-- | Crypto.mk | 15 | ||||
| -rw-r--r-- | Ssl.mk | 15 |
2 files changed, 24 insertions, 6 deletions
@@ -13,7 +13,12 @@ include $(LOCAL_PATH)/android-config.mk LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -ifneq (,$(TARGET_BUILD_APPS)) +# 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 +# in the NDK. +ifeq (,$(TARGET_BUILD_APPS)) +LOCAL_CLANG := true +else LOCAL_SDK_VERSION := 9 endif @@ -32,12 +37,16 @@ include $(LOCAL_PATH)/android-config.mk LOCAL_SHARED_LIBRARIES := $(log_shared_libraries) -ifneq (,$(TARGET_BUILD_APPS)) +# 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 +# in the NDK. +ifeq (,$(TARGET_BUILD_APPS)) +LOCAL_CLANG := true +else LOCAL_SDK_VERSION := 9 endif LOCAL_LDFLAGS += -ldl -LOCAL_CLANG := true LOCAL_SRC_FILES += $(target_src_files) LOCAL_CFLAGS += $(target_c_flags) LOCAL_C_INCLUDES += $(target_c_includes) @@ -11,7 +11,12 @@ include $(LOCAL_PATH)/Ssl-config.mk include $(CLEAR_VARS) include $(LOCAL_PATH)/android-config.mk -ifneq (,$(TARGET_BUILD_APPS)) +# 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 +# in the NDK. +ifeq (,$(TARGET_BUILD_APPS)) +LOCAL_CLANG := true +else LOCAL_SDK_VERSION := 9 endif @@ -29,11 +34,15 @@ include $(BUILD_STATIC_LIBRARY) include $(CLEAR_VARS) include $(LOCAL_PATH)/android-config.mk -ifneq (,$(TARGET_BUILD_APPS)) +# 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 +# in the NDK. +ifeq (,$(TARGET_BUILD_APPS)) +LOCAL_CLANG := true +else LOCAL_SDK_VERSION := 9 endif -LOCAL_CLANG := true LOCAL_SRC_FILES += $(target_src_files) LOCAL_CFLAGS += $(target_c_flags) LOCAL_C_INCLUDES += $(target_c_includes) |