From 7b31f3fe55887215bff517e4620b6f788125c558 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Sun, 15 Nov 2009 12:09:30 +0800 Subject: [PATCH] remove unnecessary stuff on x86 --- emulator/keymaps/Android.mk | 2 ++ emulator/qemud/Android.mk | 2 ++ emulator/qtools/Android.mk | 2 ++ emulator/sensors/Android.mk | 3 ++- emulator/tools/Android.mk | 3 ++- 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/emulator/keymaps/Android.mk b/emulator/keymaps/Android.mk index 81ac5300..b68c32d2 100644 --- a/emulator/keymaps/Android.mk +++ b/emulator/keymaps/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(TARGET_ARCH),arm) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) LOCAL_SRC_FILES := qwerty.kcm @@ -16,3 +17,4 @@ file := $(TARGET_OUT_KEYLAYOUT)/AVRCP.kl ALL_PREBUILT += $(file) $(file) : $(LOCAL_PATH)/AVRCP.kl | $(ACP) $(transform-prebuilt-to-target) +endif diff --git a/emulator/qemud/Android.mk b/emulator/qemud/Android.mk index a186c73d..27d6788b 100644 --- a/emulator/qemud/Android.mk +++ b/emulator/qemud/Android.mk @@ -1,5 +1,6 @@ # Copyright 2008 The Android Open Source Project +ifeq ($(TARGET_ARCH),arm) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -14,3 +15,4 @@ LOCAL_MODULE:= qemud LOCAL_MODULE_TAGS := debug include $(BUILD_EXECUTABLE) +endif diff --git a/emulator/qtools/Android.mk b/emulator/qtools/Android.mk index 149390c2..4bc57075 100644 --- a/emulator/qtools/Android.mk +++ b/emulator/qtools/Android.mk @@ -4,6 +4,7 @@ # Java method trace dump tool # +ifeq ($(TARGET_ARCH),arm) LOCAL_PATH:= $(call my-dir) common_includes := external/qemu @@ -155,3 +156,4 @@ LOCAL_C_INCLUDES += $(common_includes) LOCAL_CFLAGS += $(common_cflags) LOCAL_MODULE := dump_regions include $(BUILD_HOST_EXECUTABLE) +endif diff --git a/emulator/sensors/Android.mk b/emulator/sensors/Android.mk index 74e02adb..8c6106cc 100644 --- a/emulator/sensors/Android.mk +++ b/emulator/sensors/Android.mk @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - +ifeq ($(TARGET_ARCH),arm) LOCAL_PATH := $(call my-dir) ifneq ($(TARGET_PRODUCT),sim) @@ -27,3 +27,4 @@ LOCAL_MODULE := sensors.goldfish LOCAL_MODULE_TAGS := debug include $(BUILD_SHARED_LIBRARY) endif +endif diff --git a/emulator/tools/Android.mk b/emulator/tools/Android.mk index c9d96134..9853a769 100644 --- a/emulator/tools/Android.mk +++ b/emulator/tools/Android.mk @@ -16,6 +16,7 @@ # that should only run in the emulator. # +ifeq ($(TARGET_ARCH),arm) LOCAL_PATH := $(call my-dir) ifneq ($(TARGET_PRODUCT),sim) @@ -33,4 +34,4 @@ LOCAL_MODULE_TAGS := debug include $(BUILD_EXECUTABLE) endif # TARGET_PRODUCT != sim - +endif -- 2.11.0