From 29e1e7393d1742f9dd5663c63026f50981e5bd89 Mon Sep 17 00:00:00 2001 From: Jeff Brown Date: Mon, 11 Jul 2011 22:12:32 -0700 Subject: [PATCH] Remove the simulator target from all makefiles. Bug: 5010576 Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977 --- Android.mk | 15 +-------------- adb/Android.mk | 18 +++--------------- libcutils/Android.mk | 16 ---------------- libdiskconfig/Android.mk | 4 ---- liblog/Android.mk | 31 ++++++++++--------------------- libnetutils/Android.mk | 7 ------- 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 @@ # LOCAL_PATH := $(my-dir) -ifneq ($(TARGET_SIMULATOR),true) - include $(call first-makefiles-under,$(LOCAL_PATH)) -else - include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk, \ - adb \ - libcutils \ - libsysutils \ - liblog \ - libnetutils \ - libpixelflinger \ - libusbhost \ - libzipfile \ - )) -endif +include $(call first-makefiles-under,$(LOCAL_PATH)) 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 # adbd device daemon # ========================================================= -# build adbd in all non-simulator builds -BUILD_ADBD := false -ifneq ($(TARGET_SIMULATOR),true) - BUILD_ADBD := true -endif +BUILD_ADBD := true # build adbd for the Linux simulator build # so we can use it to test the adb USB gadget driver on x86 @@ -143,21 +139,14 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT_SBIN) LOCAL_UNSTRIPPED_PATH := $(TARGET_ROOT_OUT_SBIN_UNSTRIPPED) -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_STATIC_LIBRARIES := libcutils - LOCAL_LDLIBS += -lpthread - include $(BUILD_HOST_EXECUTABLE) -else - LOCAL_STATIC_LIBRARIES := libcutils libc - include $(BUILD_EXECUTABLE) -endif +LOCAL_STATIC_LIBRARIES := libcutils libc +include $(BUILD_EXECUTABLE) endif # adb host tool for device-as-host # ========================================================= -ifneq ($(TARGET_SIMULATOR),true) ifneq ($(SDK_ONLY),true) include $(CLEAR_VARS) @@ -196,4 +185,3 @@ LOCAL_STATIC_LIBRARIES := libzipfile libunz libcutils include $(BUILD_EXECUTABLE) endif -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) include $(BUILD_HOST_STATIC_LIBRARY) -ifeq ($(TARGET_SIMULATOR),true) - -# Shared library for simulator -# ======================================================== -include $(CLEAR_VARS) -LOCAL_MODULE := libcutils -LOCAL_SRC_FILES := $(commonSources) $(commonHostSources) memory.c dlmalloc_stubs.c -LOCAL_LDLIBS := -lpthread -LOCAL_SHARED_LIBRARIES := liblog -LOCAL_CFLAGS += $(targetSmpFlag) -include $(BUILD_SHARED_LIBRARY) - -else #!sim - # Shared and static library for target # ======================================================== include $(CLEAR_VARS) @@ -147,5 +133,3 @@ LOCAL_SRC_FILES := str_parms.c hashmap.c memory.c LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) - -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 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -ifneq ($(TARGET_SIMULATOR),true) - commonSources := \ diskconfig.c \ diskutils.c \ @@ -23,5 +21,3 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libcutils LOCAL_CFLAGS := -O2 -g -W -Wall -Werror -D_LARGEFILE64_SOURCE include $(BUILD_HOST_STATIC_LIBRARY) endif # HOST_OS == linux - -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 LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 include $(BUILD_HOST_STATIC_LIBRARY) -ifeq ($(TARGET_SIMULATOR),true) - # Shared library for simulator - # ======================================================== - include $(CLEAR_VARS) - LOCAL_MODULE := liblog - LOCAL_SRC_FILES := $(liblog_host_sources) - LOCAL_LDLIBS := -lpthread - LOCAL_CFLAGS := -DFAKE_LOG_DEVICE=1 - include $(BUILD_SHARED_LIBRARY) -else # !sim - # Shared and static library for target - # ======================================================== - include $(CLEAR_VARS) - LOCAL_MODULE := liblog - LOCAL_SRC_FILES := $(liblog_sources) - include $(BUILD_STATIC_LIBRARY) +# Shared and static library for target +# ======================================================== +include $(CLEAR_VARS) +LOCAL_MODULE := liblog +LOCAL_SRC_FILES := $(liblog_sources) +include $(BUILD_STATIC_LIBRARY) - include $(CLEAR_VARS) - LOCAL_MODULE := liblog - LOCAL_WHOLE_STATIC_LIBRARIES := liblog - include $(BUILD_SHARED_LIBRARY) -endif # !sim +include $(CLEAR_VARS) +LOCAL_MODULE := liblog +LOCAL_WHOLE_STATIC_LIBRARIES := liblog +include $(BUILD_SHARED_LIBRARY) 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:= \ LOCAL_SHARED_LIBRARIES := \ libcutils -# need "-lrt" on Linux simulator to pick up clock_gettime -ifeq ($(TARGET_SIMULATOR),true) - ifeq ($(HOST_OS),linux) - LOCAL_LDLIBS += -lrt -lpthread - endif -endif - LOCAL_MODULE:= libnetutils 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 @@ ifneq ($(BUILD_TINY_ANDROID),true) -BUILD_LIBSYSUTILS := false -ifneq ($(TARGET_SIMULATOR),true) - BUILD_LIBSYSUTILS := true -endif - -ifeq ($(BUILD_LIBSYSUTILS),true) LOCAL_PATH:= $(call my-dir) @@ -27,11 +21,6 @@ LOCAL_CFLAGS := LOCAL_SHARED_LIBRARIES := libcutils -ifeq ($(TARGET_SIMULATOR),true) - LOCAL_LDLIBS += -lpthread -endif - include $(BUILD_SHARED_LIBRARY) endif -endif