ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix non-existent module error" am: 1173476551 am: 47d5a1f03f

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/1398408

Change-Id: Ib3e2cde18104f6304ec2e28fd4023bd3257d9bfe
This commit is contained in:
Treehugger Robot 2020-08-12 20:06:47 +00:00 • committed by Automerger Merge Worker
commit 6f3649d425
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
init/Android.mk
View file

@ -119,6 +119,13 @@ 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)
@ -133,8 +140,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := init_vendor
ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
LOCAL_REQUIRED_MODULES := \
init_first_stage \
LOCAL_REQUIRED_MODULES := $(init_vendor_deps)
endif
include $(BUILD_PHONY_PACKAGE)
init_vendor_deps :=