commit dec793732650d7d4d5f66511ec59f04a451315fa
author Stephen Hines <srhines@google.com> Tue Mar 15 05:12:35 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 15 05:12:35 2016 +0000
tree 51ff130363532558a8d6150a1eb095cf374b80bd
parent 0aad154093daab5923b165996e7af19c0d1f84ed
parent 2d6b714d4194570d7bfe48b26037ff0b87e54d69

Merge "Add the ability to build for arm64 to asan."

lib/asan/Android.mk

diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk
index a888718..58b11dc 100644
--- a/lib/asan/Android.mk
+++ b/lib/asan/Android.mk
@@ -125,8 +125,6 @@
 	-std=c++11
 
 
-ifeq ($(TARGET_ARCH),arm)
-
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libasan
@@ -135,11 +133,10 @@
     external/compiler-rt/include
 LOCAL_CFLAGS += $(asan_rtl_cflags)
 LOCAL_SRC_FILES := asan_preinit.cc
-#LOCAL_SRC_FILES := asan_android_stub.cc asan_preinit.cc
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SANITIZE := never
+LOCAL_MODULE_TARGET_ARCH := arm arm64
 include $(BUILD_STATIC_LIBRARY)
 
 define build-asan-rt-shared-library
@@ -172,8 +169,8 @@
 endif
 LOCAL_CLANG := true
 LOCAL_SANITIZE := never
+LOCAL_MODULE_TARGET_ARCH := arm arm64
 LOCAL_CXX_STL := none
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_SHARED_LIBRARY)
 
 endef
@@ -195,7 +192,7 @@
 LOCAL_CPPFLAGS := -std=c++11
 LOCAL_SHARED_LIBRARIES += libc
 LOCAL_SANITIZE := never
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_MODULE_TARGET_ARCH := arm arm64
 LOCAL_CXX_STL := libc++
 
 include $(BUILD_EXECUTABLE)
@@ -224,7 +221,7 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
 LOCAL_SANITIZE := never
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_MODULE_TARGET_ARCH := arm arm64
 LOCAL_CXX_STL := libc++
 
 include $(BUILD_STATIC_TEST_LIBRARY)
@@ -245,15 +242,13 @@
 LOCAL_SHARED_LIBRARIES := libc
 LOCAL_SANITIZE := address
 LOCAL_CLANG := true
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
+LOCAL_MODULE_TARGET_ARCH := arm arm64
 LOCAL_CXX_STL := libc++
 
 include $(BUILD_NATIVE_TEST)
 
 endif # SKIP_LLVM_TESTS
 
-endif # ifeq($(TARGET_ARCH),arm)
-
 ################################################################################
 # Host modules
 
@@ -266,7 +261,6 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
 LOCAL_MULTILIB := both
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SANITIZE := never
 LOCAL_WHOLE_STATIC_LIBRARIES := libubsan
 include $(BUILD_HOST_STATIC_LIBRARY)
@@ -279,7 +273,6 @@
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
 LOCAL_MULTILIB := both
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SANITIZE := never
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -306,7 +299,6 @@
 LOCAL_CLANG := true
 LOCAL_CXX_STL := libc++
 LOCAL_MULTILIB := both
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SANITIZE := never
 include $(BUILD_HOST_STATIC_TEST_LIBRARY)
 
@@ -328,7 +320,6 @@
 LOCAL_LDLIBS := -lrt
 LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
 LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 include $(BUILD_HOST_NATIVE_TEST)
 endif # SKIP_LLVM_TESTS
 endif

lib/ubsan/Android.mk

diff --git a/lib/ubsan/Android.mk b/lib/ubsan/Android.mk
index f4ca635..89e23ed 100644
--- a/lib/ubsan/Android.mk
+++ b/lib/ubsan/Android.mk
@@ -43,8 +43,6 @@
 ################################################################################
 # Target modules
 
-ifeq ($(TARGET_ARCH),arm)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := libubsan
 LOCAL_CPP_EXTENSION := .cc
@@ -53,11 +51,10 @@
 LOCAL_SRC_FILES := $(ubsan_rtl_files)
 LOCAL_CXX_STL := none
 LOCAL_SANITIZE := never
+LOCAL_MODULE_TARGET_ARCH := arm arm64
 LOCAL_MULTILIB := both
 include $(BUILD_STATIC_LIBRARY)
 
-endif # ($(TARGET_ARCH),arm)
-
 ################################################################################
 # Host modules