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

Commit a7ac8107 authored Jul 15, 2021 by Treehugger Robot Committed by Automerger Merge Worker Jul 15, 2021

Merge "Revert "Re-land removing RECOVERY_AS_BOOT check for init_first_stage""...

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

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

Change-Id: I0b54cb36881d6e31233d83e4a81e0aab04a41fa8

parents 25c301c8 eafdcd0b

init/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -257,7 +257,7 @@ soong_config_module_type {
	name: "init_first_stage_cc_defaults",		name: "init_first_stage_cc_defaults",
	module_type: "cc_defaults",		module_type: "cc_defaults",
	config_namespace: "ANDROID",		config_namespace: "ANDROID",
	bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE"],		bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE", "BOARD_USES_RECOVERY_AS_BOOT"],
	properties: ["installable"],		properties: ["installable"],
	}		}

	@@ -269,6 +269,9 @@ init_first_stage_cc_defaults {
	BOARD_BUILD_SYSTEM_ROOT_IMAGE: {		BOARD_BUILD_SYSTEM_ROOT_IMAGE: {
	installable: false,		installable: false,
	},		},
			BOARD_USES_RECOVERY_AS_BOOT: {
			installable: false,
			},
	},		},
	}		}

init/Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -9,8 +9,10 @@ LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
	LOCAL_LICENSE_CONDITIONS := notice		LOCAL_LICENSE_CONDITIONS := notice
	LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE
	ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)		ifneq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
			ifneq ($(BOARD_USES_RECOVERY_AS_BOOT),true)
	LOCAL_REQUIRED_MODULES := \		LOCAL_REQUIRED_MODULES := \
	init_first_stage \		init_first_stage \

			endif # BOARD_USES_RECOVERY_AS_BOOT
	endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE		endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE
	include $(BUILD_PHONY_PACKAGE)		include $(BUILD_PHONY_PACKAGE)