Merge "Drop the device specific support for update host simulator"

This commit is contained in:
Tianjie Xu
2019-07-14 22:49:59 +00:00
committed by Gerrit Code Review
+2 -13
View File
@@ -112,8 +112,8 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
# TODO(xunchang) move to bp file
# update_host_simulator (static executable) # update_host_simulator (host executable)
# =============================== # ===============================
include $(CLEAR_VARS) include $(CLEAR_VARS)
@@ -133,21 +133,10 @@ LOCAL_CFLAGS := \
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libupdater_host \ libupdater_host \
libupdater_core \ libupdater_core \
$(TARGET_RECOVERY_UPDATER_HOST_LIBS) \
$(TARGET_RECOVERY_UPDATER_HOST_EXTRA_LIBS) \
$(updater_common_static_libraries) \ $(updater_common_static_libraries) \
libfstab \ libfstab \
libc++fs libc++fs
LOCAL_MODULE_CLASS := EXECUTABLES 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) include $(BUILD_HOST_EXECUTABLE)