commit 852981c0c38fb45cae1abdb628fe93b27fccaf0a
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 13 01:47:19 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 13 01:47:19 2021 +0000
tree 620e6e27c33f458508734b0fb7b5691a2665bf30
parent 086e31510d58c7fb5cb737a605bb48879a6c53ac
parent 662729bc2e7c8de827991369ca4453b9f8b1bc95

Merge "Re-land removing RECOVERY_AS_BOOT check for init_first_stage" am: 662729bc2e

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

Change-Id: I55d9f6b583b635aef4699a1ed5926a09f89b3f03

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index 3e8d4e3..46fa1f6 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", "BOARD_USES_RECOVERY_AS_BOOT"],
+    bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE"],
     properties: ["installable"],
 }
 
@@ -269,9 +269,6 @@
         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 c08fe03..c1b0cf9 100644
--- a/init/Android.mk
+++ b/init/Android.mk
@@ -9,10 +9,8 @@
 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)