From 78ee4c1005dd99e8e5d8c0f6fbee428616be2008 Mon Sep 17 00:00:00 2001
From: Yo Chiang <yochiang@google.com>
Date: Wed, 12 Aug 2020 23:50:24 +0800
Subject: [PATCH] Fix non-existent module error

TARGET module init_vendor requires non-existent TARGET module: init_first_stage

Module `init_first_stage` is skipped (not defined) on ASAN builds.

Bug: 163802658
Test: TH
Change-Id: I5aa030dfaa59a21511a7112ff89f8a5d8b8dc735
---
 init/Android.mk | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/init/Android.mk b/init/Android.mk
index da94daf44..2fbbf4af7 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -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 :=