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

am 96e59eb8: Merge "Support for multiple tests" into gingerbread

Browse Source 
Merge commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab' into gingerbread-plus-aosp

* commit '96e59eb8f34e999deb9eb4974cbfc07c71df3cab':
  Support for multiple tests
This commit is contained in:
Jeff Brown 2010-06-14 16:32:28 -07:00 committed by Android Git Automerger
commit cb920b9923
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 := \
InputDispatcher_test.cpp
LOCAL_SHARED_LIBRARIES := \
shared_libraries := \
libcutils \
libutils \
libEGL \
@ -16,21 +16,26 @@ LOCAL_SHARED_LIBRARIES := \
libui \
libstlport
LOCAL_STATIC_LIBRARIES := \
static_libraries := \
libgtest \
libgtest_main
LOCAL_C_INCLUDES := \
c_includes := \
bionic \
bionic/libstdc++/include \
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)) \
)

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

@ -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)) \
)