summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-06-10 13:39:29 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-10 13:39:29 -0700
commit0306b8084ff855932f3bde69401bf1bbe3241b94 (patch)
treef5f2246a1b360e2eb7e6d917ae063ec1f7690517
parent5022aa4519ed937bef7496fb3a141ab19677b4a5 (diff)
parent4768d150edb4ad27fb32161acd071356600d8d49 (diff)
downloadreplicant_openssl-0306b8084ff855932f3bde69401bf1bbe3241b94.zip
replicant_openssl-0306b8084ff855932f3bde69401bf1bbe3241b94.tar.gz
replicant_openssl-0306b8084ff855932f3bde69401bf1bbe3241b94.tar.bz2
am 4768d150: Merge "Remove clang as compiler for static versions"
* commit '4768d150edb4ad27fb32161acd071356600d8d49': Remove clang as compiler for static versions
-rw-r--r--Crypto.mk1
-rw-r--r--Ssl.mk1
2 files changed, 0 insertions, 2 deletions
diff --git a/Crypto.mk b/Crypto.mk
index 132f12c..724d4cf 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -17,7 +17,6 @@ ifneq (,$(TARGET_BUILD_APPS))
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)
diff --git a/Ssl.mk b/Ssl.mk
index fe779c6..48bfbef 100644
--- a/Ssl.mk
+++ b/Ssl.mk
@@ -15,7 +15,6 @@ ifneq (,$(TARGET_BUILD_APPS))
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)