diff options
| author | Ian Rogers <irogers@google.com> | 2014-05-23 22:10:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 22:10:22 +0000 |
| commit | ad40e46256982f3f2ac9c0cfab82c964e7fc99d4 (patch) | |
| tree | 628a9b7ad3b93ddbf87cd172dfd9f2cf9d979527 /NativeCode.mk | |
| parent | da93b0b660c45418002b15747435b04b6b91e33a (diff) | |
| parent | 9de62953e121019594298b79c07cc7c1d5c956f2 (diff) | |
| download | libcore-ad40e46256982f3f2ac9c0cfab82c964e7fc99d4.zip libcore-ad40e46256982f3f2ac9c0cfab82c964e7fc99d4.tar.gz libcore-ad40e46256982f3f2ac9c0cfab82c964e7fc99d4.tar.bz2 | |
am 9de62953: am 694b7052: am 697dc169: Merge "Build libcore native code on the host with clang."
* commit '9de62953e121019594298b79c07cc7c1d5c956f2':
Build libcore native code on the host with clang.
Diffstat (limited to 'NativeCode.mk')
| -rw-r--r-- | NativeCode.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/NativeCode.mk b/NativeCode.mk index 429360a..05f4379 100644 --- a/NativeCode.mk +++ b/NativeCode.mk @@ -114,6 +114,7 @@ endif # LIBCORE_SKIP_TESTS ifeq ($(WITH_HOST_DALVIK),true) include $(CLEAR_VARS) + LOCAL_CLANG := true LOCAL_SRC_FILES += $(core_src_files) LOCAL_CFLAGS += $(core_cflags) LOCAL_C_INCLUDES += $(core_c_includes) @@ -128,6 +129,7 @@ ifeq ($(WITH_HOST_DALVIK),true) ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) + LOCAL_CLANG := true LOCAL_SRC_FILES += $(core_test_files) LOCAL_CFLAGS += $(core_cflags) LOCAL_C_INCLUDES += libcore/include external/openssl/include |