commit dbf4b11b1158137e55342d250f624196a8912e07
author android-build-team Robot <android-build-team-robot@google.com> Mon Jul 30 03:00:37 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Mon Jul 30 03:00:37 2018 +0000
tree 8ece454f1a2f1f150002a294f9639e4cf1e62d33
parent 252878e88968a67291099078862824dae7dc75c0
parent fbe26c723af60b101a6df9c066c1b661b6ab966c

Snap for 4920102 from fbe26c723af60b101a6df9c066c1b661b6ab966c to pi-qpr1-release

Change-Id: Ifd7027234368d31d675303934b1f0f8b6e23d714

tests/Android.mk

diff --git a/tests/Android.mk b/tests/Android.mk
index c945bab..fc7b940 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -68,25 +68,6 @@
     $(LOCAL_PATH)/file-check-cxx \
     | $(HOST_OUT_EXECUTABLES)/FileCheck$(HOST_EXECUTABLE_SUFFIX) \
 
-LOCAL_CXX = $(LOCAL_PATH)/file-check-cxx \
-    $(HOST_OUT_EXECUTABLES)/FileCheck \
-    $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_CXX) \
-    GCC \
-
-LOCAL_CLANG := false
-LOCAL_MODULE := bionic-compile-time-tests-g++
-LOCAL_CPPFLAGS := -Wall -Werror
-# Disable color diagnostics so the warnings output matches the source
-LOCAL_CPPFLAGS += -fdiagnostics-color=never
-LOCAL_SRC_FILES := fortify_filecheck_diagnostics_test.cpp
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_ADDITIONAL_DEPENDENCIES := \
-    $(LOCAL_PATH)/Android.mk \
-    $(LOCAL_PATH)/file-check-cxx \
-    | $(HOST_OUT_EXECUTABLES)/FileCheck$(HOST_EXECUTABLE_SUFFIX) \
-
 LOCAL_CXX := $(LOCAL_PATH)/file-check-cxx \
     $(HOST_OUT_EXECUTABLES)/FileCheck \
     $(LLVM_PREBUILTS_PATH)/clang++ \