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

Commit a903001e authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am d1313da5: am eb6e0df1: Don\'t build framework tests for simulator target. 

Merge commit 'd1313da5999e06be16e52527cfba443f66b333a1'

* commit 'd1313da5999e06be16e52527cfba443f66b333a1':
  Don't build framework tests for simulator target.
parents b916f6f1 015b8a66

libs/ui/tests/Android.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,9 @@ 
LOCAL_PATH:= $(call my-dir)

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)

include $(CLEAR_VARS)





ifneq ($(TARGET_SIMULATOR),true)



# Build the unit tests.

test_src_files := \

test_src_files := \

    InputChannel_test.cpp \

    InputChannel_test.cpp \

    InputDispatcher_test.cpp \

    InputDispatcher_test.cpp \
@@ -43,3 +46,5 @@ $(foreach file,$(test_src_files), \ 




# Build the manual test programs.

# Build the manual test programs.

include $(call all-subdir-makefiles)

include $(call all-subdir-makefiles)



endif
 
 No newline at end of file

libs/utils/tests/Android.mk

+5 −0
Original line number Original line Diff line number Diff line
@@ -2,6 +2,9 @@ 
LOCAL_PATH := $(call my-dir)

LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

include $(CLEAR_VARS)





ifneq ($(TARGET_SIMULATOR),true)



# Build the unit tests.

test_src_files := \

test_src_files := \

	ObbFile_test.cpp \

	ObbFile_test.cpp \

	PollLoop_test.cpp

	PollLoop_test.cpp
@@ -37,3 +40,5 @@ $(foreach file,$(test_src_files), \ 
    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \

    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \

    $(eval include $(BUILD_EXECUTABLE)) \

    $(eval include $(BUILD_EXECUTABLE)) \

)

)



endif
 
 No newline at end of file