commit 0aad154093daab5923b165996e7af19c0d1f84ed
author Dan Willemsen <dwillemsen@google.com> Tue Mar 08 05:57:38 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 08 05:57:38 2016 +0000
tree 04d1373ac2502926d7c417464a1686a18279f622
parent c6124f7579ddf07c26c37595049edab3da6a4dcd
parent b09bd8b703471410af7a8d32a7b251301b451ada

Merge "Use libunwind's version of unwind.h"

lib/asan/Android.mk

diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk
index c274bd6..a888718 100644
--- a/lib/asan/Android.mk
+++ b/lib/asan/Android.mk
@@ -207,7 +207,6 @@
 LOCAL_MODULE := libasan_noinst_test
 LOCAL_MODULE_TAGS := tests
 LOCAL_C_INCLUDES := \
-    external/gtest/include \
     external/compiler-rt/include \
     external/compiler-rt/lib \
     external/compiler-rt/lib/asan/tests \
@@ -228,7 +227,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CXX_STL := libc++
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_STATIC_TEST_LIBRARY)
 
 
 include $(CLEAR_VARS)
@@ -236,21 +235,20 @@
 LOCAL_MODULE := asan_test
 LOCAL_MODULE_TAGS := tests
 LOCAL_C_INCLUDES := \
-    external/gtest/include \
     external/compiler-rt/lib \
     external/compiler-rt/lib/asan/tests \
     external/compiler-rt/lib/sanitizer_common/tests
 LOCAL_CFLAGS += $(asan_test_cflags)
 LOCAL_SRC_FILES := $(asan_test_files)
 LOCAL_CPP_EXTENSION := .cc
-LOCAL_STATIC_LIBRARIES := libgtest libasan_noinst_test
+LOCAL_STATIC_LIBRARIES := libasan_noinst_test
 LOCAL_SHARED_LIBRARIES := libc
 LOCAL_SANITIZE := address
 LOCAL_CLANG := true
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_CXX_STL := libc++
 
-include $(BUILD_EXECUTABLE)
+include $(BUILD_NATIVE_TEST)
 
 endif # SKIP_LLVM_TESTS
 
@@ -291,7 +289,6 @@
 LOCAL_MODULE := libasan_noinst_test
 LOCAL_MODULE_TAGS := tests
 LOCAL_C_INCLUDES := \
-    external/gtest/include \
     external/compiler-rt/include \
     external/compiler-rt/lib \
     external/compiler-rt/lib/asan/tests \
@@ -311,7 +308,7 @@
 LOCAL_MULTILIB := both
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
 LOCAL_SANITIZE := never
-include $(BUILD_HOST_STATIC_LIBRARY)
+include $(BUILD_HOST_STATIC_TEST_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := asan_test