summaryrefslogtreecommitdiffstats
path: root/Crypto.mk
diff options
context:
space:
mode:
Diffstat (limited to 'Crypto.mk')
-rw-r--r--Crypto.mk15
1 files changed, 12 insertions, 3 deletions
diff --git a/Crypto.mk b/Crypto.mk
index 724d4cf..7bb313b 100644
--- a/Crypto.mk
+++ b/Crypto.mk
@@ -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)