openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Revert "Fix non-existent module error""

This commit is contained in:
Treehugger Robot 2020-08-18 07:41:01 +00:00 committed by Gerrit Code Review
parent 5d0eb66590 4adce5fec3
commit d7cb6e1fd0
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
init/Android.mk
View File

@ -119,13 +119,6 @@ LOCAL_SANITIZE := signed-integer-overflow
# First stage init is weird: it may start without stdout/stderr, and no /proc.
LOCAL_NOSANITIZE := hwaddress
include $(BUILD_EXECUTABLE)
# LOCAL_FORCE_STATIC_EXECUTABLE targets are skipped and not defined for ASAN builds
init_vendor_deps :=
ifneq (true,$(my_skip_this_target))
init_vendor_deps += init_first_stage
endif # my_skip_this_target is true
endif
include $(CLEAR_VARS)
@ -140,7 +133,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := init_vendor
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
LOCAL_REQUIRED_MODULES := $(init_vendor_deps)
LOCAL_REQUIRED_MODULES := \
init_first_stage \
endif
include $(BUILD_PHONY_PACKAGE)
init_vendor_deps :=