Merge "Fix non-existent module error"
diff --git a/init/Android.mk b/init/Android.mk
index da94daf..2fbbf4a 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -119,6 +119,13 @@
# 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 @@
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 :=