am 52f1edb3: Merge "Update tests for new build target"

* commit '52f1edb3f11aae1af74a1bfc6f18f81b4d761358':
  Update tests for new build target
This commit is contained in:
Kenny Root 2012-10-02 09:54:22 -07:00 committed by Android Git Automerger
commit ee42072bcc

View File

@ -4,42 +4,30 @@ include $(CLEAR_VARS)
# Build the unit tests. # Build the unit tests.
test_src_files := \ test_src_files := \
BasicHashtable_test.cpp \ BasicHashtable_test.cpp \
BlobCache_test.cpp \ BlobCache_test.cpp \
Looper_test.cpp \ Looper_test.cpp \
String8_test.cpp \ String8_test.cpp \
Unicode_test.cpp \ Unicode_test.cpp \
Vector_test.cpp \ Vector_test.cpp \
ZipFileRO_test.cpp ZipFileRO_test.cpp
shared_libraries := \ shared_libraries := \
libz \ libz \
liblog \ liblog \
libcutils \ libcutils \
libutils \ libutils \
libstlport libstlport
static_libraries := \ static_libraries := \
libgtest \ libgtest \
libgtest_main libgtest_main
c_includes := \
external/zlib \
external/icu4c/common \
bionic \
bionic/libstdc++/include \
external/gtest/include \
external/stlport/stlport
module_tags := eng tests
$(foreach file,$(test_src_files), \ $(foreach file,$(test_src_files), \
$(eval include $(CLEAR_VARS)) \ $(eval include $(CLEAR_VARS)) \
$(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \ $(eval LOCAL_SHARED_LIBRARIES := $(shared_libraries)) \
$(eval LOCAL_STATIC_LIBRARIES := $(static_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_NATIVE_TEST)) \
$(eval include $(BUILD_EXECUTABLE)) \
) )