ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 8 Pull Requests Releases Wiki Activity

Support for multiple tests

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

Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
This commit is contained in:
Jeff Brown 2010-06-14 15:44:41 -07:00 committed by Kenny Root
parent 7bf6a50b19
commit f69280ef72
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/ui/tests/Android.mk
View File

@ -5,7 +5,7 @@ include $(CLEAR_VARS)
test_src_files := \ test_src_files := \
InputDispatcher_test.cpp InputDispatcher_test.cpp
LOCAL_SHARED_LIBRARIES := \ shared_libraries := \
libcutils \ libcutils \
libutils \ libutils \
libEGL \ libEGL \
@ -16,21 +16,26 @@ LOCAL_SHARED_LIBRARIES := \
libui \ libui \
libstlport libstlport
LOCAL_STATIC_LIBRARIES := \ static_libraries := \
libgtest \ libgtest \
libgtest_main libgtest_main
LOCAL_C_INCLUDES := \ c_includes := \
bionic \ bionic \
bionic/libstdc++/include \ bionic/libstdc++/include \
external/gtest/include \ external/gtest/include \
external/stlport/stlport external/stlport/stlport
LOCAL_MODULE_TAGS := eng tests module_tags := eng tests
$(foreach file,$(test_src_files), \ $(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_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \
$(eval include $(BUILD_EXECUTABLE)) \ $(eval include $(BUILD_EXECUTABLE)) \
) )

13
libs/utils/tests/Android.mk
View File

@ -5,18 +5,18 @@ include $(CLEAR_VARS)
test_src_files := \ test_src_files := \
PollLoop_test.cpp PollLoop_test.cpp
LOCAL_SHARED_LIBRARIES := \ shared_libraries := \
libz \ libz \
liblog \ liblog \
libcutils \ libcutils \
libutils \ libutils \
libstlport libstlport
LOCAL_STATIC_LIBRARIES := \ static_libraries := \
libgtest \ libgtest \
libgtest_main libgtest_main
LOCAL_C_INCLUDES := \ c_includes := \
external/zlib \ external/zlib \
external/icu4c/common \ external/icu4c/common \
bionic \ bionic \
@ -24,10 +24,15 @@ LOCAL_C_INCLUDES := \
external/gtest/include \ external/gtest/include \
external/stlport/stlport external/stlport/stlport
LOCAL_MODULE_TAGS := eng tests module_tags := eng tests
$(foreach file,$(test_src_files), \ $(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_SRC_FILES := $(file)) \
$(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \ $(eval LOCAL_MODULE := $(notdir $(file:%.cpp=%))) \
$(eval LOCAL_MODULE_TAGS := $(module_tags)) \
$(eval include $(BUILD_EXECUTABLE)) \ $(eval include $(BUILD_EXECUTABLE)) \
) )