commit 9fa041c9a433b0e64e522f2b653be2def9695bb7
author Inseob Kim <inseob@google.com> Thu Jul 01 02:33:53 2021 +0000
committer Inseob Kim <inseob@google.com> Thu Jul 01 02:33:53 2021 +0000
tree 8f93823aa6ae83427e55ef44a103324f8623a93b
parent 94c2593ea065f91783601b1858dcac430f110c68

Revert "Remove RECOVERY_AS_BOOT check for init_first_stage"

This reverts commit 94c2593ea065f91783601b1858dcac430f110c68.

Reason for revert: build breakage

Change-Id: I270a56bb33d19a2747298c69f6ec1b24746d97bf

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 7a4916e..d0b58ca 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -257,7 +257,7 @@
     name: "init_first_stage_cc_defaults",
     module_type: "cc_defaults",
     config_namespace: "ANDROID",
-    bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE"],
+    bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE", "BOARD_USES_RECOVERY_AS_BOOT"],
     properties: ["installable"],
 }
 
@@ -269,6 +269,9 @@
         BOARD_BUILD_SYSTEM_ROOT_IMAGE: {
             installable: false,
         },
+        BOARD_USES_RECOVERY_AS_BOOT: {
+            installable: false,
+        },
     },
 }
 

init/Android.mk

diff --git a/init/Android.mk b/init/Android.mk
index c1b0cf9..c08fe03 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -9,8 +9,10 @@
 LOCAL_LICENSE_CONDITIONS := notice
 LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
 ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
+ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
 LOCAL_REQUIRED_MODULES := \
    init_first_stage \
 
+endif  # BOARD_USES_RECOVERY_AS_BOOT
 endif  # BOARD_BUILD_SYSTEM_ROOT_IMAGE
 include $(BUILD_PHONY_PACKAGE)