From 6f23f0d48fc29e645c4afafd1e3b6445887d7328 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 11 Jul 2011 22:12:33 -0700 Subject: [PATCH] Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: I5a7df94d99dcb6f1de98bd9b8f659fd51a491c82 --- Android.mk | 4 +--- tests/binder/benchmarks/Android.mk | 5 ----- tests/framebuffer/Android.mk | 10 ---------- 3 files changed, 1 insertion(+), 18 deletions(-) diff --git a/Android.mk b/Android.mk index 08fe18fc..cde61f69 100644 --- a/Android.mk +++ b/Android.mk @@ -14,6 +14,4 @@ # limitations under the License. # -ifneq ($(TARGET_SIMULATOR),true) - include $(all-subdir-makefiles) -endif +include $(all-subdir-makefiles) diff --git a/tests/binder/benchmarks/Android.mk b/tests/binder/benchmarks/Android.mk index 53d35a07..15dfe6c5 100644 --- a/tests/binder/benchmarks/Android.mk +++ b/tests/binder/benchmarks/Android.mk @@ -14,9 +14,6 @@ # limitations under the License. # -ifneq ($(TARGET_SIMULATOR),true) # GTest needs STLport, which the simulator - # doesn't support - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -44,5 +41,3 @@ LOCAL_C_INCLUDES += \ LOCAL_MODULE := binderAddInts LOCAL_SRC_FILES := binderAddInts.cpp include $(BUILD_EXECUTABLE) - -endif diff --git a/tests/framebuffer/Android.mk b/tests/framebuffer/Android.mk index 2c048573..3ee98281 100644 --- a/tests/framebuffer/Android.mk +++ b/tests/framebuffer/Android.mk @@ -11,18 +11,10 @@ LOCAL_MODULE:= test-fb-refresh LOCAL_MODULE_TAGS := optional -ifeq ($(TARGET_SIMULATOR),true) - ifeq ($(HOST_OS),linux) - # need this for clock_gettime() - LOCAL_LDLIBS += -lrt - endif -endif - include $(BUILD_EXECUTABLE) ## -ifneq ($(TARGET_SIMULATOR),true) include $(CLEAR_VARS) LOCAL_SRC_FILES := fb_test.c LOCAL_MODULE = test-fb-simple @@ -38,5 +30,3 @@ LOCAL_MODULE_TAGS := optional LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_STATIC_LIBRARIES := libc include $(BUILD_EXECUTABLE) - -endif # sim -- 2.11.0