Stop hardcoding gtest headers/libs.
Bug: http://b/16574165
Change-Id: Ic3942ca394b0e8dd47977bc8d703f65846cfbb83
diff --git a/suite/audio_quality/test/Android.mk b/suite/audio_quality/test/Android.mk
index 21b0250..e37e6d1 100644
--- a/suite/audio_quality/test/Android.mk
+++ b/suite/audio_quality/test/Android.mk
@@ -19,10 +19,19 @@
LOCAL_SRC_FILES := $(call all-subdir-cpp-files)
#$(info $(LOCAL_SRC_FILES))
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/../lib/include $(LOCAL_PATH)/../lib/src external/gtest/include \
- external/tinyalsa/include/ libcore/include
-LOCAL_STATIC_LIBRARIES := libutils libgtest_host libgtest_main_host liblog libcutils libtinyalsa \
- libtinyxml
+LOCAL_C_INCLUDES := \
+ $(LOCAL_PATH)/../lib/include \
+ $(LOCAL_PATH)/../lib/src \
+ external/tinyalsa/include/ \
+ libcore/include \
+
+LOCAL_STATIC_LIBRARIES := \
+ libutils \
+ liblog \
+ libcutils \
+ libtinyalsa \
+ libtinyxml \
+
# need to keep everything in libcts_.. Otherwise, linker will drop some
# functions and linker error happens
LOCAL_WHOLE_STATIC_LIBRARIES := libcts_audio_quality
@@ -30,4 +39,4 @@
LOCAL_LDFLAGS:= -g -lrt -ldl -lm -fno-exceptions -lpthread
LOCAL_MODULE_HOST_OS := linux
LOCAL_MODULE:= cts_audio_quality_test
-include $(BUILD_HOST_EXECUTABLE)
+include $(BUILD_HOST_NATIVE_TEST)
diff --git a/suite/cts/deviceTests/opengl/test/Android.mk b/suite/cts/deviceTests/opengl/test/Android.mk
index e83e584..a9ec558 100644
--- a/suite/cts/deviceTests/opengl/test/Android.mk
+++ b/suite/cts/deviceTests/opengl/test/Android.mk
@@ -18,9 +18,9 @@
LOCAL_SRC_FILES := $(call all-subdir-cpp-files)
LOCAL_SRC_FILES += ../jni/graphics/Matrix.cpp
-LOCAL_C_INCLUDES += external/gtest/include $(LOCAL_PATH)/../jni/graphics/
-LOCAL_STATIC_LIBRARIES := libgtest_host libgtest_main_host liblog
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/../jni/graphics/
+LOCAL_STATIC_LIBRARIES := liblog
LOCAL_LDFLAGS:= -g -lpthread
LOCAL_MODULE_HOST_OS := linux
LOCAL_MODULE:= cts_device_opengl_test
-include $(BUILD_HOST_EXECUTABLE)
+include $(BUILD_HOST_NATIVE_TEST)
diff --git a/tests/tests/nativemedia/sl/Android.mk b/tests/tests/nativemedia/sl/Android.mk
index 28dfeff..57f609d 100644
--- a/tests/tests/nativemedia/sl/Android.mk
+++ b/tests/tests/nativemedia/sl/Android.mk
@@ -16,7 +16,6 @@
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
LOCAL_C_INCLUDES := \
- external/gtest/include \
$(call include-path-for, wilhelm) \
$(call include-path-for, wilhelm-ut)
diff --git a/tests/tests/nativemedia/xa/Android.mk b/tests/tests/nativemedia/xa/Android.mk
index 52126c3..4badf3c 100644
--- a/tests/tests/nativemedia/xa/Android.mk
+++ b/tests/tests/nativemedia/xa/Android.mk
@@ -16,7 +16,6 @@
LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
LOCAL_C_INCLUDES := \
- external/gtest/include \
$(call include-path-for, wilhelm) \
$(call include-path-for, wilhelm-ut)
diff --git a/tests/tests/nativeopengl/libnativeopengltests/Android.mk b/tests/tests/nativeopengl/libnativeopengltests/Android.mk
index 9338d8b..3de4979 100644
--- a/tests/tests/nativeopengl/libnativeopengltests/Android.mk
+++ b/tests/tests/nativeopengl/libnativeopengltests/Android.mk
@@ -28,7 +28,6 @@
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/$(my_src_dir) \
- external/gtest/include
# The sources are in ../standalone/jni/
LOCAL_SRC_FILES := $(addprefix $(my_src_dir)/, \
