Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddb1971e authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Revert "Remove RECOVERY_AS_BOOT check for init_first_stage" am: 9fa041c9

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

Change-Id: I549937e822fac8691ec502299d03abf8fbcc3746
parents 8bfd66fa 9fa041c9
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ soong_config_module_type {
    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 @@ init_first_stage_cc_defaults {
        BOARD_BUILD_SYSTEM_ROOT_IMAGE: {
            installable: false,
        },
        BOARD_USES_RECOVERY_AS_BOOT: {
            installable: false,
        },
    },
}

+2 −0
Original line number Diff line number Diff line
@@ -9,8 +9,10 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
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)