Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e1e739 authored by Jeff Brown's avatar Jeff Brown
Browse files

Remove the simulator target from all makefiles. 

Bug: 5010576

Change-Id: I2fcf31af681d92880e5d31a46d5f6777f7ca1977
parent 56286d6f

Android.mk

+1 −14
Original line number Diff line number Diff line
@@ -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

adb/Android.mk

+3 −15
Original line number Diff line number Diff line
@@ -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 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



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

libcutils/Android.mk

+0 −16
Original line number Diff line number Diff line
@@ -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

libdiskconfig/Android.mk

+0 −4
Original line number Diff line number Diff line 
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

liblog/Android.mk

+10 −21
Original line number Diff line number Diff line
@@ -48,16 +48,6 @@ 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)
@@ -69,4 +59,3 @@ else # !sim 
LOCAL_MODULE := liblog

LOCAL_WHOLE_STATIC_LIBRARIES := liblog

include $(BUILD_SHARED_LIBRARY)
 
endif # !sim