diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-08 18:41:01 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-09-11 15:49:57 -0700 |
| commit | 715d01aedf7e789a37f7aac8f41827bfddcc0634 (patch) | |
| tree | ed25db7ba2977a255f1b2ac5f41b0f0540830b01 | |
| parent | f4eaaadb8cb0e2ff8d1704827883b5a62173311d (diff) | |
| download | frameworks_base-715d01aedf7e789a37f7aac8f41827bfddcc0634.zip frameworks_base-715d01aedf7e789a37f7aac8f41827bfddcc0634.tar.gz frameworks_base-715d01aedf7e789a37f7aac8f41827bfddcc0634.tar.bz2 | |
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
| -rw-r--r-- | libs/androidfw/tests/Android.mk | 5 | ||||
| -rw-r--r-- | services/input/tests/Android.mk | 9 |
2 files changed, 0 insertions, 14 deletions
diff --git a/libs/androidfw/tests/Android.mk b/libs/androidfw/tests/Android.mk index 977ba80..cf11bb7 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 9278f41..3eb93dc 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 |