From 4adce5fec3b0dd0acce24ad5b7e8ef37373421f1 Mon Sep 17 00:00:00 2001
From: Yo Chiang <yochiang@google.com>
Date: Thu, 13 Aug 2020 04:54:18 +0000
Subject: [PATCH] Revert "Fix non-existent module error"

This reverts commit 78ee4c1005dd99e8e5d8c0f6fbee428616be2008.

Reason for revert: revert bad fix

Change-Id: I45c2bc2414679d525677b0bc103167316e16b0c4
---
 init/Android.mk | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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