From 715d01aedf7e789a37f7aac8f41827bfddcc0634 Mon Sep 17 00:00:00 2001 From: Dan Albert Date: Mon, 8 Sep 2014 18:41:01 -0700 Subject: [PATCH] Clean up test makefiles. The build system takes care of linking the correct STL and gtest libraries for you, and specifying them manually confuses the build system when using libc++. Change-Id: I9f76ab26a63ace51293614cfb5ca002f37438e02 --- libs/androidfw/tests/Android.mk | 5 ----- services/input/tests/Android.mk | 9 --------- 2 files changed, 14 deletions(-) diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index 977ba80cd49ef..cf11bb72310b7 100644 --- a/libs/androidfw/tests/Android.mk +++ b/libs/androidfw/tests/Android.mk @@ -13,11 +13,6 @@ shared_libraries := \ libcutils \ libutils \ libui \ - libstlport - -static_libraries := \ - libgtest \ - libgtest_main $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ diff --git a/services/input/tests/Android.mk b/services/input/tests/Android.mk index 9278f413c3a08..3eb93dc5e7cf4 100644 --- a/services/input/tests/Android.mk +++ b/services/input/tests/Android.mk @@ -16,19 +16,10 @@ shared_libraries := \ libhardware_legacy \ libui \ libskia \ - libstlport \ libinput \ libinputservice -static_libraries := \ - libgtest \ - libgtest_main - c_includes := \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ - external/stlport/stlport \ external/skia/include/core module_tags := eng tests