diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 16:22:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 16:22:03 +0000 |
| commit | 4355c0c98644c37f0511257403bbfb71b342e2df (patch) | |
| tree | 6a114c465b05b6e65f1ef7d8325dac1ee7e614f8 /libs/input | |
| parent | 9e8b528926506b3fa9ca7df52fef5f56ec6149c7 (diff) | |
| parent | e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2 (diff) | |
| download | frameworks_native-4355c0c98644c37f0511257403bbfb71b342e2df.tar.gz frameworks_native-4355c0c98644c37f0511257403bbfb71b342e2df.tar.bz2 frameworks_native-4355c0c98644c37f0511257403bbfb71b342e2df.zip | |
am e1e3d278: Merge "Clean cruft out of makefiles."
* commit 'e1e3d278549eb6389eb0b5fa3f13a4ac079a55a2':
Clean cruft out of makefiles.
Diffstat (limited to 'libs/input')
| -rw-r--r-- | libs/input/tests/Android.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libs/input/tests/Android.mk b/libs/input/tests/Android.mk index 9612a65fe..5bfa3d480 100644 --- a/libs/input/tests/Android.mk +++ b/libs/input/tests/Android.mk @@ -1,6 +1,5 @@ # Build the unit tests. LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) # Build the unit tests. test_src_files := \ @@ -14,14 +13,10 @@ shared_libraries := \ libutils \ libbinder \ libui \ - libstlport - -static_libraries := \ - libgtest \ - libgtest_main $(foreach file,$(test_src_files), \ $(eval include $(CLEAR_VARS)) \ + $(eval LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_STATIC_LIBRARIES := $(static_libraries)) \ $(eval LOCAL_SRC_FILES := $(file)) \ @@ -33,6 +28,7 @@ $(foreach file,$(test_src_files), \ # run. All assertions are static_asserts and will fail during # buildtime if something's wrong. include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_SRC_FILES := StructLayout_test.cpp LOCAL_MODULE := StructLayout_test LOCAL_CFLAGS := -std=c++11 -O0 |