summaryrefslogtreecommitdiffstats
path: root/libs/utils
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2010-06-14 15:44:41 -0700
committerKenny Root <kroot@google.com>2010-06-14 15:46:08 -0700
commitf1d3802ea2e0c68f3f6e7524c2450379aae670a8 (patch)
tree09f253a46061d984df1e08f1f69300878698536c /libs/utils
parent7e900cbf1d600a8895e63a0247f45c116ff05172 (diff)
downloadframeworks_base-f1d3802ea2e0c68f3f6e7524c2450379aae670a8.zip
frameworks_base-f1d3802ea2e0c68f3f6e7524c2450379aae670a8.tar.gz
frameworks_base-f1d3802ea2e0c68f3f6e7524c2450379aae670a8.tar.bz2
Support for multiple tests
The build system enforces some invariants that were being ignored before. Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
Diffstat (limited to 'libs/utils')
-rw-r--r--libs/utils/tests/Android.mk13
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)) \
)