diff options
author | Jeff Brown <jeffbrown@google.com> | 2011-07-12 12:16:46 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-12 12:16:46 -0700 |
commit | d7892bf2802c113f2f8824253809d7e7f6e57471 (patch) | |
tree | fe3969edfef40ef7b4cfa97c2eb63dcc96d1db88 | |
parent | 9690ca9c16d9435d2a384ad996513e2b5ee1f778 (diff) | |
parent | 6f23f0d48fc29e645c4afafd1e3b6445887d7328 (diff) | |
download | extras-d7892bf2802c113f2f8824253809d7e7f6e57471.tar.gz |
Merge "Remove the simulator target from all makefiles. Bug: 5010576"
-rw-r--r-- | Android.mk | 4 | ||||
-rw-r--r-- | tests/binder/benchmarks/Android.mk | 5 | ||||
-rw-r--r-- | tests/framebuffer/Android.mk | 10 |
3 files changed, 1 insertions, 18 deletions
@@ -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 |