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 | |
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
-rw-r--r-- | Android.mk | 15 | ||||
-rw-r--r-- | adb/Android.mk | 18 | ||||
-rw-r--r-- | libcutils/Android.mk | 16 | ||||
-rw-r--r-- | libdiskconfig/Android.mk | 4 | ||||
-rw-r--r-- | liblog/Android.mk | 31 | ||||
-rw-r--r-- | libnetutils/Android.mk | 7 | ||||
-rw-r--r-- | libsysutils/Android.mk | 11 |
7 files changed, 14 insertions, 88 deletions
diff --git a/Android.mk b/Android.mk index a30771921..7c5725869 100644 --- a/Android.mk +++ b/Android.mk | |||
@@ -15,17 +15,4 @@ | |||
15 | # | 15 | # |
16 | LOCAL_PATH := $(my-dir) | 16 | LOCAL_PATH := $(my-dir) |
17 | 17 | ||
18 | ifneq ($(TARGET_SIMULATOR),true) | 18 | include $(call first-makefiles-under,$(LOCAL_PATH)) |
19 | include $(call first-makefiles-under,$(LOCAL_PATH)) | ||
20 | else | ||
21 | include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ | ||
22 | adb \ | ||
23 | libcutils \ | ||
24 | libsysutils \ | ||
25 | liblog \ | ||
26 | libnetutils \ | ||
27 | libpixelflinger \ | ||
28 | libusbhost \ | ||
29 | libzipfile \ | ||
30 | )) | ||
31 | endif | ||
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 | ||
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 260a0f3d0..0c4e235c1 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk | |||
@@ -93,20 +93,6 @@ LOCAL_CFLAGS += $(hostSmpFlag) | |||
93 | include $(BUILD_HOST_STATIC_LIBRARY) | 93 | include $(BUILD_HOST_STATIC_LIBRARY) |
94 | 94 | ||
95 | 95 | ||
96 | ifeq ($(TARGET_SIMULATOR),true) | ||
97 | |||
98 | # Shared library for simulator | ||
99 | # ======================================================== | ||
100 | include $(CLEAR_VARS) | ||
101 | LOCAL_MODULE := libcutils | ||
102 | LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) memory.c dlmalloc_stubs.c | ||
103 | LOCAL_LDLIBS := -lpthread | ||
104 | LOCAL_SHARED_LIBRARIES := liblog | ||
105 | LOCAL_CFLAGS += $(targetSmpFlag) | ||
106 | include $(BUILD_SHARED_LIBRARY) | ||
107 | |||
108 | else #!sim | ||
109 | |||
110 | # Shared and static library for target | 96 | # Shared and static library for target |
111 | # ======================================================== | 97 | # ======================================================== |
112 | include $(CLEAR_VARS) | 98 | include $(CLEAR_VARS) |
@@ -147,5 +133,3 @@ LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c | |||
147 | LOCAL_SHARED_LIBRARIES := liblog | 133 | LOCAL_SHARED_LIBRARIES := liblog |
148 | LOCAL_MODULE_TAGS := optional | 134 | LOCAL_MODULE_TAGS := optional |
149 | include $(BUILD_EXECUTABLE) | 135 | include $(BUILD_EXECUTABLE) |
150 | |||
151 | endif #!sim | ||
diff --git a/libdiskconfig/Android.mk b/libdiskconfig/Android.mk index c887955ea..74be2d9bd 100644 --- a/libdiskconfig/Android.mk +++ b/libdiskconfig/Android.mk | |||
@@ -1,8 +1,6 @@ | |||
1 | LOCAL_PATH := $(call my-dir) | 1 | LOCAL_PATH := $(call my-dir) |
2 | include $(CLEAR_VARS) | 2 | include $(CLEAR_VARS) |
3 | 3 | ||
4 | ifneq ($(TARGET_SIMULATOR),true) | ||
5 | |||
6 | commonSources := \ | 4 | commonSources := \ |
7 | diskconfig.c \ | 5 | diskconfig.c \ |
8 | diskutils.c \ | 6 | diskutils.c \ |
@@ -23,5 +21,3 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils | |||
23 | LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE | 21 | LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE |
24 | include $(BUILD_HOST_STATIC_LIBRARY) | 22 | include $(BUILD_HOST_STATIC_LIBRARY) |
25 | endif # HOST_OS == linux | 23 | endif # HOST_OS == linux |
26 | |||
27 | endif # ! TARGET_SIMULATOR | ||
diff --git a/liblog/Android.mk b/liblog/Android.mk index 0eec87f04..bd4fed4a0 100644 --- a/liblog/Android.mk +++ b/liblog/Android.mk | |||
@@ -48,25 +48,14 @@ LOCAL_LDLIBS := -lpthread | |||
48 | LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 | 48 | LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 |
49 | include $(BUILD_HOST_STATIC_LIBRARY) | 49 | include $(BUILD_HOST_STATIC_LIBRARY) |
50 | 50 | ||
51 | ifeq ($(TARGET_SIMULATOR),true) | 51 | # Shared and static library for target |
52 | # Shared library for simulator | 52 | # ======================================================== |
53 | # ======================================================== | 53 | include $(CLEAR_VARS) |
54 | include $(CLEAR_VARS) | 54 | LOCAL_MODULE := liblog |
55 | LOCAL_MODULE := liblog | 55 | LOCAL_SRC_FILES := $(liblog_sources) |
56 | LOCAL_SRC_FILES := $(liblog_host_sources) | 56 | include $(BUILD_STATIC_LIBRARY) |
57 | LOCAL_LDLIBS := -lpthread | ||
58 | LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 | ||
59 | include $(BUILD_SHARED_LIBRARY) | ||
60 | else # !sim | ||
61 | # Shared and static library for target | ||
62 | # ======================================================== | ||
63 | include $(CLEAR_VARS) | ||
64 | LOCAL_MODULE := liblog | ||
65 | LOCAL_SRC_FILES := $(liblog_sources) | ||
66 | include $(BUILD_STATIC_LIBRARY) | ||
67 | 57 | ||
68 | include $(CLEAR_VARS) | 58 | include $(CLEAR_VARS) |
69 | LOCAL_MODULE := liblog | 59 | LOCAL_MODULE := liblog |
70 | LOCAL_WHOLE_STATIC_LIBRARIES := liblog | 60 | LOCAL_WHOLE_STATIC_LIBRARIES := liblog |
71 | include $(BUILD_SHARED_LIBRARY) | 61 | include $(BUILD_SHARED_LIBRARY) |
72 | endif # !sim | ||
diff --git a/libnetutils/Android.mk b/libnetutils/Android.mk index 46102d55c..1ef7da9b1 100644 --- a/libnetutils/Android.mk +++ b/libnetutils/Android.mk | |||
@@ -11,13 +11,6 @@ LOCAL_SRC_FILES:= \ | |||
11 | LOCAL_SHARED_LIBRARIES := \ | 11 | LOCAL_SHARED_LIBRARIES := \ |
12 | libcutils | 12 | libcutils |
13 | 13 | ||
14 | # need "-lrt" on Linux simulator to pick up clock_gettime | ||
15 | ifeq ($(TARGET_SIMULATOR),true) | ||
16 | ifeq ($(HOST_OS),linux) | ||
17 | LOCAL_LDLIBS += -lrt -lpthread | ||
18 | endif | ||
19 | endif | ||
20 | |||
21 | LOCAL_MODULE:= libnetutils | 14 | LOCAL_MODULE:= libnetutils |
22 | 15 | ||
23 | include $(BUILD_SHARED_LIBRARY) | 16 | include $(BUILD_SHARED_LIBRARY) |
diff --git a/libsysutils/Android.mk b/libsysutils/Android.mk index 3b1f6183f..cccf484ce 100644 --- a/libsysutils/Android.mk +++ b/libsysutils/Android.mk | |||
@@ -1,10 +1,4 @@ | |||
1 | ifneq ($(BUILD_TINY_ANDROID),true) | 1 | ifneq ($(BUILD_TINY_ANDROID),true) |
2 | BUILD_LIBSYSUTILS := false | ||
3 | ifneq ($(TARGET_SIMULATOR),true) | ||
4 | BUILD_LIBSYSUTILS := true | ||
5 | endif | ||
6 | |||
7 | ifeq ($(BUILD_LIBSYSUTILS),true) | ||
8 | 2 | ||
9 | LOCAL_PATH:= $(call my-dir) | 3 | LOCAL_PATH:= $(call my-dir) |
10 | 4 | ||
@@ -27,11 +21,6 @@ LOCAL_CFLAGS := | |||
27 | 21 | ||
28 | LOCAL_SHARED_LIBRARIES := libcutils | 22 | LOCAL_SHARED_LIBRARIES := libcutils |
29 | 23 | ||
30 | ifeq ($(TARGET_SIMULATOR),true) | ||
31 | LOCAL_LDLIBS += -lpthread | ||
32 | endif | ||
33 | |||
34 | include $(BUILD_SHARED_LIBRARY) | 24 | include $(BUILD_SHARED_LIBRARY) |
35 | 25 | ||
36 | endif | 26 | endif |
37 | endif | ||