commit 80d9c1cfb0642e680c559a854d09514c2fc72edc
author Jeff Brown <jeffbrown@google.com> Mon Jun 14 15:44:41 2010 -0700
committer Alex Ray <aray@google.com> Tue Jul 30 13:56:53 2013 -0700
tree 58dc713f879c8f54775f567aef47b193c2cf02f5
parent ea5c46b7c180f741762f1a66203e3c99ffccc752

Support for multiple tests

The build system enforces some invariants that were being ignored
before.

Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8

libs/utils/tests/Android.mk

diff --git a/libs/utils/tests/Android.mk b/libs/utils/tests/Android.mk
index 45e8061..92ebfd7 100644
--- a/libs/utils/tests/Android.mk
+++ b/libs/utils/tests/Android.mk
@@ -5,18 +5,18 @@
 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 @@
     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)) \
 )