Merge "init: separate init packaging for mainline" am: 89bf115a70

am: a0ff184778

Change-Id: I2513daa55e3f3bcf76ec62a9013d326b528168d3
This commit is contained in:
Tom Cherry 2018-10-16 13:45:10 -07:00 committed by android-build-merger
commit f59b95b65b

View file

@ -51,7 +51,8 @@ LOCAL_SRC_FILES := \
uevent_listener.cpp \
util.cpp \
LOCAL_MODULE := init
LOCAL_MODULE := init_first_stage
LOCAL_MODULE_STEM := init
LOCAL_FORCE_STATIC_EXECUTABLE := true
@ -87,8 +88,32 @@ LOCAL_STATIC_LIBRARIES := \
libselinux \
libcap \
LOCAL_REQUIRED_MODULES := \
init_second_stage \
LOCAL_SANITIZE := signed-integer-overflow
include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_MODULE := init_system
ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
LOCAL_REQUIRED_MODULES := \
init_first_stage \
init_second_stage \
else
LOCAL_REQUIRED_MODULES := \
init_second_stage \
endif
include $(BUILD_PHONY_PACKAGE)
include $(CLEAR_VARS)
LOCAL_MODULE := init_vendor
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
LOCAL_REQUIRED_MODULES := \
init_first_stage \
endif
include $(BUILD_PHONY_PACKAGE)