diff options
author | Jeff Brown | 2011-07-12 00:12:32 -0500 |
---|---|---|
committer | Jeff Brown | 2011-07-12 00:12:32 -0500 |
commit | 29e1e7393d1742f9dd5663c63026f50981e5bd89 (patch) | |
tree | 0baf9441d44fce10821ec9bf1f32655e5695a8aa /adb/Android.mk | |
parent | 56286d6fdb07d8b1310c27eeb59bdf05500f166e (diff) | |
download | platform-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.mk | 18 |
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 | 98 | BUILD_ADBD := true |
99 | BUILD_ADBD := false | ||
100 | ifneq ($(TARGET_SIMULATOR),true) | ||
101 | BUILD_ADBD := true | ||
102 | endif | ||
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 | |||
143 | LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) | 139 | LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) |
144 | LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED) | 140 | LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED) |
145 | 141 | ||
146 | ifeq ($(TARGET_SIMULATOR),true) | 142 | LOCAL_STATIC_LIBRARIES := libcutils libc |
147 | LOCAL_STATIC_LIBRARIES := libcutils | 143 | include $(BUILD_EXECUTABLE) |
148 | LOCAL_LDLIBS += -lpthread | ||
149 | include $(BUILD_HOST_EXECUTABLE) | ||
150 | else | ||
151 | LOCAL_STATIC_LIBRARIES := libcutils libc | ||
152 | include $(BUILD_EXECUTABLE) | ||
153 | endif | ||
154 | 144 | ||
155 | endif | 145 | endif |
156 | 146 | ||
157 | 147 | ||
158 | # adb host tool for device-as-host | 148 | # adb host tool for device-as-host |
159 | # ========================================================= | 149 | # ========================================================= |
160 | ifneq ($(TARGET_SIMULATOR),true) | ||
161 | ifneq ($(SDK_ONLY),true) | 150 | ifneq ($(SDK_ONLY),true) |
162 | include $(CLEAR_VARS) | 151 | include $(CLEAR_VARS) |
163 | 152 | ||
@@ -196,4 +185,3 @@ LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils | |||
196 | 185 | ||
197 | include $(BUILD_EXECUTABLE) | 186 | include $(BUILD_EXECUTABLE) |
198 | endif | 187 | endif |
199 | endif | ||