Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 416b9395 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix non-existent module error"" am: d7cb6e1f am: cb54d935 

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

Change-Id: I448aab0a4caec0076d69f94a4bd1c4cc30cf39dc
parents d6e98167 cb54d935

init/Android.mk

+3 −9
Original line number Diff line number Diff line
@@ -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 :=