diff options
| author | niuchl <niuchl@google.com> | 2015-09-04 18:02:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 18:02:35 +0000 |
| commit | 48f8b34cc7428912b2ab98527afde1af3c4994d8 (patch) | |
| tree | b73947a60412c38c53f2776d9844314b5e06fc3c | |
| parent | 850ad0a8d6a79706a5f3aba64506334ddf02ee5e (diff) | |
| parent | 3d4127a6bc4e8575b30a612216062cf6045f4500 (diff) | |
| download | compiler-rt-48f8b34cc7428912b2ab98527afde1af3c4994d8.tar.gz | |
am 3d4127a6: am 6ea04067: Merge "Revert "Update TARGET_ARCH guards to allow x86.""
* commit '3d4127a6bc4e8575b30a612216062cf6045f4500':
Revert "Update TARGET_ARCH guards to allow x86."
| -rw-r--r-- | lib/asan/Android.mk | 5 | ||||
| -rw-r--r-- | lib/ubsan/Android.mk | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk index 41aca4f1b..ff731e399 100644 --- a/lib/asan/Android.mk +++ b/lib/asan/Android.mk @@ -125,8 +125,7 @@ asan_test_cflags := \ -std=c++11 -# Currently, only supported on arm and x86 -ifneq (,$(filter $(TARGET_ARCH),arm x86)) +ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) @@ -253,7 +252,7 @@ include $(BUILD_EXECUTABLE) endif # SKIP_LLVM_TESTS -endif # TARGET_ARCH guard +endif # ifeq($(TARGET_ARCH),arm) ################################################################################ # Host modules diff --git a/lib/ubsan/Android.mk b/lib/ubsan/Android.mk index b7c4a28e0..f4ca635ec 100644 --- a/lib/ubsan/Android.mk +++ b/lib/ubsan/Android.mk @@ -43,8 +43,7 @@ ubsan_rtl_c_includes := \ ################################################################################ # Target modules -# Currently, only supported on arm and x86 -ifneq (,$(filter $(TARGET_ARCH),arm x86)) +ifeq ($(TARGET_ARCH),arm) include $(CLEAR_VARS) LOCAL_MODULE := libubsan @@ -57,7 +56,7 @@ LOCAL_SANITIZE := never LOCAL_MULTILIB := both include $(BUILD_STATIC_LIBRARY) -endif # TARGET_ARCH guard +endif # ($(TARGET_ARCH),arm) ################################################################################ # Host modules |