commit 94c2593ea065f91783601b1858dcac430f110c68
author Inseob Kim <inseob@google.com> Wed Jun 30 20:24:30 2021 +0900
committer Inseob Kim <inseob@google.com> Wed Jun 30 11:35:21 2021 +0000
tree b68c0afcced948cd855928e9b03810ea49915955
parent 729e08f6eac3dda94481ade1c5b4ef56def59a90

Remove RECOVERY_AS_BOOT check for init_first_stage

This has kept adb_debug.prop from being installed.

Ignore-AOSP-First: fixes sc-release test breakage

Bug: 192432810
Test: build ramdisk-debug.img and see contents
Change-Id: I254579d2c6427213f40e9ae8e50d046e19390ba5

init/Android.bp

diff --git a/init/Android.bp b/init/Android.bp
index d0b58ca..7a4916e 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)