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

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

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

Merge commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3' into gingerbread-plus-aosp

* commit 'eb6e0df18a6567d38caa039ba0b0e49e2e9b46c3':
  Don't build framework tests for simulator target.
parents d14dbcf7 a50ee3ec
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

ifneq ($(TARGET_SIMULATOR),true)

# Build the unit tests.
test_src_files := \
    InputChannel_test.cpp \
    InputDispatcher_test.cpp \
@@ -43,3 +46,5 @@ $(foreach file,$(test_src_files), \

# Build the manual test programs.
include $(call all-subdir-makefiles)

endif
 No newline at end of file
+5 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)

ifneq ($(TARGET_SIMULATOR),true)

# Build the unit tests.
test_src_files := \
	ObbFile_test.cpp \
	PollLoop_test.cpp
@@ -37,3 +40,5 @@ $(foreach file,$(test_src_files), \
    $(eval LOCAL_MODULE_TAGS := $(module_tags)) \
    $(eval include $(BUILD_EXECUTABLE)) \
)

endif
 No newline at end of file