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

Commit eafdcd0b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage"" am: d939aa24 

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

Change-Id: Ia948bc1aa191c5170536b6c865699cab5a39fab6
parents b0b9d35d d939aa24

init/Android.bp

+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,

        },

    },

}

init/Android.mk

+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)