summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Brown2011-07-12 00:12:32 -0500
committerJeff Brown2011-07-12 00:12:32 -0500
commit29e1e7393d1742f9dd5663c63026f50981e5bd89 (patch)
tree0baf9441d44fce10821ec9bf1f32655e5695a8aa /adb/Android.mk
parent56286d6fdb07d8b1310c27eeb59bdf05500f166e (diff)
downloadplatform-system-core-29e1e7393d1742f9dd5663c63026f50981e5bd89.tar.gz
platform-system-core-29e1e7393d1742f9dd5663c63026f50981e5bd89.tar.xz
platform-system-core-29e1e7393d1742f9dd5663c63026f50981e5bd89.zip
Remove the simulator target from all makefiles.
Bug: 5010576 Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977
Diffstat (limited to 'adb/Android.mk')
-rw-r--r--adb/Android.mk18
1 files changed, 3 insertions, 15 deletions
diff --git a/adb/Android.mk b/adb/Android.mk
index 2ac933536..7744d2b51 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -95,11 +95,7 @@ endif
95# adbd device daemon 95# adbd device daemon
96# ========================================================= 96# =========================================================
97 97
98# build adbd in all non-simulator builds 98BUILD_ADBD := true
99BUILD_ADBD := false
100ifneq ($(TARGET_SIMULATOR),true)
101 BUILD_ADBD := true
102endif
103 99
104# build adbd for the Linux simulator build 100# build adbd for the Linux simulator build
105# so we can use it to test the adb USB gadget driver on x86 101# so we can use it to test the adb USB gadget driver on x86
@@ -143,21 +139,14 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
143LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) 139LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN)
144LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED) 140LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED)
145 141
146ifeq ($(TARGET_SIMULATOR),true) 142LOCAL_STATIC_LIBRARIES := libcutils libc
147 LOCAL_STATIC_LIBRARIES := libcutils 143include $(BUILD_EXECUTABLE)
148 LOCAL_LDLIBS += -lpthread
149 include $(BUILD_HOST_EXECUTABLE)
150else
151 LOCAL_STATIC_LIBRARIES := libcutils libc
152 include $(BUILD_EXECUTABLE)
153endif
154 144
155endif 145endif
156 146
157 147
158# adb host tool for device-as-host 148# adb host tool for device-as-host
159# ========================================================= 149# =========================================================
160ifneq ($(TARGET_SIMULATOR),true)
161ifneq ($(SDK_ONLY),true) 150ifneq ($(SDK_ONLY),true)
162include $(CLEAR_VARS) 151include $(CLEAR_VARS)
163 152
@@ -196,4 +185,3 @@ LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils
196 185
197include $(BUILD_EXECUTABLE) 186include $(BUILD_EXECUTABLE)
198endif 187endif
199endif