From b42281a423356b55a3e0138316497999f04a706b Mon Sep 17 00:00:00 2001 From: Tianjie Xu Date: Tue, 2 Jul 2019 15:39:59 -0700 Subject: Drop the device specific support for update host simulator The device specific libs prevent us from building an universal simulator to add to the otatools. Drop the support since there is currently no active users of the simulator extension; plus we will unlikely to implement the device specific simulator runtime. As a alternation, we will add the commandline arguments to skip certain unsupported functions, and move the simulator build to the bp file. Bug: 131911365 Test: mma Change-Id: I3ff0f45dbebe3ed72d5f4670a869b40e6cfd5a7c --- updater/Android.mk | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/updater/Android.mk b/updater/Android.mk index 63fd7bdfe..93525c12a 100644 --- a/updater/Android.mk +++ b/updater/Android.mk @@ -112,8 +112,8 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true include $(BUILD_EXECUTABLE) - -# update_host_simulator (static executable) +# TODO(xunchang) move to bp file +# update_host_simulator (host executable) # =============================== include $(CLEAR_VARS) @@ -133,21 +133,10 @@ LOCAL_CFLAGS := \ LOCAL_STATIC_LIBRARIES := \ libupdater_host \ libupdater_core \ - $(TARGET_RECOVERY_UPDATER_HOST_LIBS) \ - $(TARGET_RECOVERY_UPDATER_HOST_EXTRA_LIBS) \ $(updater_common_static_libraries) \ libfstab \ libc++fs LOCAL_MODULE_CLASS := EXECUTABLES -inc := $(call local-generated-sources-dir)/register.inc - -$(inc) : libs := $(TARGET_RECOVERY_UPDATER_HOST_LIBS) -$(inc) : - $(call generate-register-inc,$@,$(libs)) - -LOCAL_GENERATED_SOURCES := $(inc) - -inc := include $(BUILD_HOST_EXECUTABLE) -- cgit v1.2.3