summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@google.com>2013-06-14 10:41:38 -0700
committerMike Lockwood <lockwood@google.com>2013-06-14 10:41:38 -0700
commit97e7398d6233b3c5633eb1dd065eb6472897dd7d (patch)
treea8b99f86bf9f527b2694623b43e7c50eeabc5893
parent6caea2d2fbc53be14f7eff513c97dd25ebd0396d (diff)
downloadreplicant_openssl-97e7398d6233b3c5633eb1dd065eb6472897dd7d.zip
replicant_openssl-97e7398d6233b3c5633eb1dd065eb6472897dd7d.tar.gz
replicant_openssl-97e7398d6233b3c5633eb1dd065eb6472897dd7d.tar.bz2
Revert "Don't use Clang if WITHOUT_CLANG is set"
This reverts commit 6caea2d2fbc53be14f7eff513c97dd25ebd0396d.
-rw-r--r--Crypto.mk4
-rw-r--r--Ssl.mk4
2 files changed, 0 insertions, 8 deletions
diff --git a/Crypto.mk b/Crypto.mk
index 965e8d3..7bb313b 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -17,9 +17,7 @@ LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
# in the NDK yet. This can be removed when a clang version that is fast enough
# in the NDK.
ifeq (,$(TARGET_BUILD_APPS))
-ifeq (,$(WITHOUT_CLANG))
LOCAL_CLANG := true
-endif
else
LOCAL_SDK_VERSION := 9
endif
@@ -43,9 +41,7 @@ LOCAL_SHARED_LIBRARIES := $(log_shared_libraries)
# in the NDK yet. This can be removed when a clang version that is fast enough
# in the NDK.
ifeq (,$(TARGET_BUILD_APPS))
-ifeq (,$(WITHOUT_CLANG))
LOCAL_CLANG := true
-endif
else
LOCAL_SDK_VERSION := 9
endif
diff --git a/Ssl.mk b/Ssl.mk
index 2a84644..47ccf14 100644
--- a/Ssl.mk
+++ b/Ssl.mk
@@ -15,9 +15,7 @@ include $(LOCAL_PATH)/android-config.mk
# in the NDK yet. This can be removed when a clang version that is fast enough
# in the NDK.
ifeq (,$(TARGET_BUILD_APPS))
-ifeq (,$(WITHOUT_CLANG))
LOCAL_CLANG := true
-endif
else
LOCAL_SDK_VERSION := 9
endif
@@ -40,9 +38,7 @@ include $(LOCAL_PATH)/android-config.mk
# in the NDK yet. This can be removed when a clang version that is fast enough
# in the NDK.
ifeq (,$(TARGET_BUILD_APPS))
-ifeq (,$(WITHOUT_CLANG))
LOCAL_CLANG := true
-endif
else
LOCAL_SDK_VERSION := 9
endif