diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-06-14 17:06:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-14 17:06:56 -0700 |
| commit | 889eb886d328d5850175e841619255c689289903 (patch) | |
| tree | 2b3c34f7a28106aac751bd83c274fcb7d74b8797 /libs/utils | |
| parent | ad239ab8fabe53e5f82ff80fb8c9260386dd900c (diff) | |
| parent | e0e5da0d648f4167e2a12ea02f4794f81a057da7 (diff) | |
| download | frameworks_base-889eb886d328d5850175e841619255c689289903.zip frameworks_base-889eb886d328d5850175e841619255c689289903.tar.gz frameworks_base-889eb886d328d5850175e841619255c689289903.tar.bz2 | |
am e0e5da0d: am 96e59eb8: Merge "Support for multiple tests" into gingerbread
Merge commit 'e0e5da0d648f4167e2a12ea02f4794f81a057da7'
* commit 'e0e5da0d648f4167e2a12ea02f4794f81a057da7':
Support for multiple tests
Diffstat (limited to 'libs/utils')
| -rw-r--r-- | libs/utils/tests/Android.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/libs/utils/tests/Android.mk b/libs/utils/tests/Android.mk index 45e8061..92ebfd7c 100644 --- a/libs/utils/tests/Android.mk +++ b/libs/utils/tests/Android.mk @@ -5,18 +5,18 @@ include $(CLEAR_VARS) test_src_files := \ PollLoop_test.cpp -LOCAL_SHARED_LIBRARIES := \ +shared_libraries := \ libz \ liblog \ libcutils \ libutils \ libstlport -LOCAL_STATIC_LIBRARIES := \ +static_libraries := \ libgtest \ libgtest_main -LOCAL_C_INCLUDES := \ +c_includes := \ external/zlib \ external/icu4c/common \ bionic \ @@ -24,10 +24,15 @@ LOCAL_C_INCLUDES := \ external/gtest/include \ external/stlport/stlport -LOCAL_MODULE_TAGS := eng tests +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_SRC_FILES := $(file)) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ + $(eval LOCAL_MODULE_TAGS := $(module_tags)) \ $(eval include $(BUILD_EXECUTABLE)) \ ) |