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
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
-rw-r--r--Android.mk15
-rw-r--r--adb/Android.mk18
-rw-r--r--libcutils/Android.mk16
-rw-r--r--libdiskconfig/Android.mk4
-rw-r--r--liblog/Android.mk31
-rw-r--r--libnetutils/Android.mk7
-rw-r--r--libsysutils/Android.mk11
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#
16LOCAL_PATH := $(my-dir) 16LOCAL_PATH := $(my-dir)
17 17
18ifneq ($(TARGET_SIMULATOR),true) 18include $(call first-makefiles-under,$(LOCAL_PATH))
19 include $(call first-makefiles-under,$(LOCAL_PATH))
20else
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 ))
31endif
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
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)
93include $(BUILD_HOST_STATIC_LIBRARY) 93include $(BUILD_HOST_STATIC_LIBRARY)
94 94
95 95
96ifeq ($(TARGET_SIMULATOR),true)
97
98# Shared library for simulator
99# ========================================================
100include $(CLEAR_VARS)
101LOCAL_MODULE := libcutils
102LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) memory.c dlmalloc_stubs.c
103LOCAL_LDLIBS := -lpthread
104LOCAL_SHARED_LIBRARIES := liblog
105LOCAL_CFLAGS += $(targetSmpFlag)
106include $(BUILD_SHARED_LIBRARY)
107
108else #!sim
109
110# Shared and static library for target 96# Shared and static library for target
111# ======================================================== 97# ========================================================
112include $(CLEAR_VARS) 98include $(CLEAR_VARS)
@@ -147,5 +133,3 @@ LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c
147LOCAL_SHARED_LIBRARIES := liblog 133LOCAL_SHARED_LIBRARIES := liblog
148LOCAL_MODULE_TAGS := optional 134LOCAL_MODULE_TAGS := optional
149include $(BUILD_EXECUTABLE) 135include $(BUILD_EXECUTABLE)
150
151endif #!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 @@
1LOCAL_PATH := $(call my-dir) 1LOCAL_PATH := $(call my-dir)
2include $(CLEAR_VARS) 2include $(CLEAR_VARS)
3 3
4ifneq ($(TARGET_SIMULATOR),true)
5
6commonSources := \ 4commonSources := \
7 diskconfig.c \ 5 diskconfig.c \
8 diskutils.c \ 6 diskutils.c \
@@ -23,5 +21,3 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils
23LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE 21LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE
24include $(BUILD_HOST_STATIC_LIBRARY) 22include $(BUILD_HOST_STATIC_LIBRARY)
25endif # HOST_OS == linux 23endif # HOST_OS == linux
26
27endif # ! 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
48LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 48LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
49include $(BUILD_HOST_STATIC_LIBRARY) 49include $(BUILD_HOST_STATIC_LIBRARY)
50 50
51ifeq ($(TARGET_SIMULATOR),true) 51# Shared and static library for target
52 # Shared library for simulator 52# ========================================================
53 # ======================================================== 53include $(CLEAR_VARS)
54 include $(CLEAR_VARS) 54LOCAL_MODULE := liblog
55 LOCAL_MODULE := liblog 55LOCAL_SRC_FILES := $(liblog_sources)
56 LOCAL_SRC_FILES := $(liblog_host_sources) 56include $(BUILD_STATIC_LIBRARY)
57 LOCAL_LDLIBS := -lpthread
58 LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1
59 include $(BUILD_SHARED_LIBRARY)
60else # !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) 58include $(CLEAR_VARS)
69 LOCAL_MODULE := liblog 59LOCAL_MODULE := liblog
70 LOCAL_WHOLE_STATIC_LIBRARIES := liblog 60LOCAL_WHOLE_STATIC_LIBRARIES := liblog
71 include $(BUILD_SHARED_LIBRARY) 61include $(BUILD_SHARED_LIBRARY)
72endif # !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:= \
11LOCAL_SHARED_LIBRARIES := \ 11LOCAL_SHARED_LIBRARIES := \
12 libcutils 12 libcutils
13 13
14# need "-lrt" on Linux simulator to pick up clock_gettime
15ifeq ($(TARGET_SIMULATOR),true)
16 ifeq ($(HOST_OS),linux)
17 LOCAL_LDLIBS += -lrt -lpthread
18 endif
19endif
20
21LOCAL_MODULE:= libnetutils 14LOCAL_MODULE:= libnetutils
22 15
23include $(BUILD_SHARED_LIBRARY) 16include $(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 @@
1ifneq ($(BUILD_TINY_ANDROID),true) 1ifneq ($(BUILD_TINY_ANDROID),true)
2BUILD_LIBSYSUTILS := false
3ifneq ($(TARGET_SIMULATOR),true)
4 BUILD_LIBSYSUTILS := true
5endif
6
7ifeq ($(BUILD_LIBSYSUTILS),true)
8 2
9LOCAL_PATH:= $(call my-dir) 3LOCAL_PATH:= $(call my-dir)
10 4
@@ -27,11 +21,6 @@ LOCAL_CFLAGS :=
27 21
28LOCAL_SHARED_LIBRARIES := libcutils 22LOCAL_SHARED_LIBRARIES := libcutils
29 23
30ifeq ($(TARGET_SIMULATOR),true)
31 LOCAL_LDLIBS += -lpthread
32endif
33
34include $(BUILD_SHARED_LIBRARY) 24include $(BUILD_SHARED_LIBRARY)
35 25
36endif 26endif
37endif