diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-16 17:31:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-16 17:31:57 +0000 |
| commit | 36ec7a8b99e287d923bfacd2ef69661818aeb85e (patch) | |
| tree | e60254b47c608f3e683ebb8c2803c3ff271277fa /services | |
| parent | 3fd6b2b912037a7cca8d2591dfa8f9a83d0e46e7 (diff) | |
| parent | d72ff140e0df44106cd8539396ce686aa8f3306a (diff) | |
| download | frameworks_native-36ec7a8b99e287d923bfacd2ef69661818aeb85e.zip frameworks_native-36ec7a8b99e287d923bfacd2ef69661818aeb85e.tar.gz frameworks_native-36ec7a8b99e287d923bfacd2ef69661818aeb85e.tar.bz2 | |
am d72ff140: Merge "Move frameworks/native to libc++."
* commit 'd72ff140e0df44106cd8539396ce686aa8f3306a':
Move frameworks/native to libc++.
Diffstat (limited to 'services')
| -rw-r--r-- | services/inputflinger/tests/Android.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/services/inputflinger/tests/Android.mk b/services/inputflinger/tests/Android.mk index 6dae82f..0742a08 100644 --- a/services/inputflinger/tests/Android.mk +++ b/services/inputflinger/tests/Android.mk @@ -16,20 +16,11 @@ shared_libraries := \ libhardware_legacy \ libui \ libskia \ - libstlport \ libinput \ libinputflinger \ libinputservice -static_libraries := \ - libgtest \ - libgtest_main - c_includes := \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ - external/stlport/stlport \ external/skia/include/core @@ -38,9 +29,8 @@ module_tags := eng tests $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ - $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ $(eval LOCAL_C_INCLUDES := $(c_includes)) \ - $(eval LOCAL_CFLAGS += -Wno-unused-parameter) \ + $(eval LOCAL_CFLAGS += -Wno-unused-parameter) \ $(eval LOCAL_SRC_FILES := $(file)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE_TAGS := $(module_tags)) \ |