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

Commit 71753982 authored Jul 12, 2011 by Jeff Brown Committed by Android (Google) Code Review Jul 12, 2011

Merge "Remove the simulator target from all makefiles. Bug: 5010576"

parents f8ff03d9 baa44b89

cmds/keystore/Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -14,8 +14,6 @@
		# limitations under the License.
		#

		ifneq ($(TARGET_SIMULATOR),true)

		LOCAL_PATH:= $(call my-dir)

		include $(CLEAR_VARS)
		@@ -32,5 +30,3 @@ LOCAL_SHARED_LIBRARIES := libcutils libcrypto
		LOCAL_MODULE:= keystore_cli
		LOCAL_MODULE_TAGS := debug
		include $(BUILD_EXECUTABLE)

		endif

libs/gui/Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -32,10 +32,6 @@ LOCAL_SHARED_LIBRARIES := \

		LOCAL_MODULE:= libgui

		ifeq ($(TARGET_SIMULATOR),true)
		LOCAL_LDLIBS += -lpthread
		endif

		include $(BUILD_SHARED_LIBRARY)

		ifeq (,$(ONE_SHOT_MAKEFILE))

libs/gui/tests/Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@
		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		ifneq ($(TARGET_SIMULATOR),true)

		LOCAL_MODULE := SurfaceTexture_test

		LOCAL_MODULE_TAGS := tests
		@@ -36,8 +34,6 @@ LOCAL_C_INCLUDES := \

		include $(BUILD_EXECUTABLE)

		endif

		# Include subdirectory makefiles
		# ============================================================

libs/surfaceflinger_client/Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -7,8 +7,4 @@ LOCAL_SHARED_LIBRARIES :=

		LOCAL_MODULE:= libsurfaceflinger_client

		ifeq ($(TARGET_SIMULATOR),true)
		LOCAL_LDLIBS += -lpthread
		endif

		include $(BUILD_SHARED_LIBRARY)

libs/ui/Android.mk

+0 −4

Original line number	Diff line number	Diff line
		@@ -68,10 +68,6 @@ LOCAL_C_INCLUDES := \

		LOCAL_MODULE:= libui

		ifeq ($(TARGET_SIMULATOR),true)
		LOCAL_LDLIBS += -lpthread
		endif

		include $(BUILD_SHARED_LIBRARY)