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

Commit d0775311 authored by Yi-yo Chiang's avatar Yi-yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" am: 9b123de8 am: 90558063 

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



Change-Id: Ib339f2f52418f2867d8e1fd6be91c52f0b73d9e4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9e11dd2 90558063

init/Android.bp

+1 −4
Original line number Diff line number Diff line
@@ -308,7 +308,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", "BOARD_USES_RECOVERY_AS_BOOT"],

    bool_variables: ["BOARD_USES_RECOVERY_AS_BOOT"],

    properties: ["installable"],

}
@@ -317,9 +317,6 @@ soong_config_module_type { 
init_first_stage_cc_defaults {

    name: "init_first_stage_defaults",

    soong_config_variables: {

        BOARD_BUILD_SYSTEM_ROOT_IMAGE: {

            installable: false,

        },

        BOARD_USES_RECOVERY_AS_BOOT: {

            installable: false,

        },

init/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -8,11 +8,9 @@ LOCAL_MODULE := init_vendor 
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)