diff options
| author | Dan Albert <danalbert@google.com> | 2014-09-12 16:22:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-12 16:22:04 +0000 |
| commit | 150d47ebfd54c3a6377efbd6e79cbc030ffc9277 (patch) | |
| tree | 49d34d743048a3a681843b16afc9ed384f490362 | |
| parent | 82a077b09db49dd93413b20b827460830aa91c88 (diff) | |
| parent | 2d7215f2bafd3fdb42df72f95f3b9e4b11119e90 (diff) | |
| download | android_frameworks_wilhelm-150d47ebfd54c3a6377efbd6e79cbc030ffc9277.tar.gz android_frameworks_wilhelm-150d47ebfd54c3a6377efbd6e79cbc030ffc9277.tar.bz2 android_frameworks_wilhelm-150d47ebfd54c3a6377efbd6e79cbc030ffc9277.zip | |
am 2d7215f2: Merge "Clean up makefile cruft."
* commit '2d7215f2bafd3fdb42df72f95f3b9e4b11119e90':
Clean up makefile cruft.
| -rw-r--r-- | tests/Android.mk | 38 | ||||
| -rw-r--r-- | tests/automated/Android.mk | 12 |
2 files changed, 10 insertions, 40 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 9818656..7b56946 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -1,39 +1,17 @@ # Build the unit tests. LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) - -test_src_files := \ - mimeUri_test.cpp \ -shared_libraries := \ +include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk +LOCAL_SHARED_LIBRARIES := \ libutils \ libOpenSLES \ - libstlport - -static_libraries := \ - libgtest \ - libgtest_main - -c_includes := \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ - $(call include-path-for, wilhelm) \ - external/stlport/stlport - -module_tags := 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_SRC_FILES := $(file)) \ - $(eval LOCAL_MODULE := libopenslestests) \ - $(eval LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest) \ - $(eval LOCAL_MODULE_TAGS := $(module_tags)) \ - $(eval include $(BUILD_EXECUTABLE)) \ -) +LOCAL_C_INCLUDES := $(call include-path-for, wilhelm) +LOCAL_SRC_FILES := mimeUri_test.cpp +LOCAL_MODULE := libopenslestests +LOCAL_MODULE_TAGS := tests +include $(BUILD_NATIVE_TEST) # Build the manual test programs. include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tests/automated/Android.mk b/tests/automated/Android.mk index c6cf7e1..0f71762 100644 --- a/tests/automated/Android.mk +++ b/tests/automated/Android.mk @@ -1,15 +1,12 @@ # Build the unit tests. LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_MODULE_TAGS := tests LOCAL_C_INCLUDES:= \ - bionic \ - bionic/libstdc++/include \ - external/gtest/include \ $(call include-path-for, wilhelm) \ - external/stlport/stlport \ $(call include-path-for, wilhelm-ut) LOCAL_SRC_FILES:= \ @@ -18,22 +15,17 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES := \ libutils \ libOpenSLES \ - libstlport LOCAL_STATIC_LIBRARIES := \ libOpenSLESUT \ - libgtest ifeq ($(TARGET_OS),linux) LOCAL_CFLAGS += -DXP_UNIX - #LOCAL_SHARED_LIBRARIES += librt endif LOCAL_MODULE:= BufferQueue_test -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest - -include $(BUILD_EXECUTABLE) +include $(BUILD_NATIVE_TEST) # Build the manual test programs. include $(call all-makefiles-under,$(LOCAL_PATH)) |