am bcaaebb8: Merge "Clean up test makefiles."

* commit 'bcaaebb8a881951720190f4a6b9ffcbf871542af': Clean up test makefiles.
2014-09-19 22:14:38 +00:00
parent ad64befd25 bcaaebb8a8
commit 8791ebf0cd
2 changed files with 0 additions and 14 deletions
--- 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)) \
--- 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