diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-11 23:21:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-11 23:21:14 +0000 |
| commit | bcaaebb8a881951720190f4a6b9ffcbf871542af (patch) | |
| tree | 258c9fa9e32da4e7403ea09438ca23cb50845c90 | |
| parent | 296a712e6b3fd48b5ace1128fa68547fdb8de84d (diff) | |
| parent | 715d01aedf7e789a37f7aac8f41827bfddcc0634 (diff) | |
| download | frameworks_base-bcaaebb8a881951720190f4a6b9ffcbf871542af.zip frameworks_base-bcaaebb8a881951720190f4a6b9ffcbf871542af.tar.gz frameworks_base-bcaaebb8a881951720190f4a6b9ffcbf871542af.tar.bz2 | |
Merge "Clean up test makefiles."
| -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 |