Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f69280ef authored by Jeff Brown's avatar Jeff Brown Committed by Kenny Root
Browse files

Support for multiple tests 

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

Change-Id: Ie7675042af7f961a507386c13b2a0b592b591af8
parent 7bf6a50b

libs/ui/tests/Android.mk

+9 −4
Original line number Diff line number Diff line
@@ -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)) \

)

libs/utils/tests/Android.mk

+9 −4
Original line number Diff line number Diff line
@@ -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)) \

)