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

Commit ddc9763e authored Oct 07, 2022 by Yi-Yo Chiang

Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE

This variable is always false or empty now, so clean up remaining
references of the variable.

Bug: 241346584
Test: Presubmit
Change-Id: Id5c37a1391239206477fd802d364a2678692f513

parent 460f70bb

init/Android.bp

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -308,7 +308,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", "BOARD_USES_RECOVERY_AS_BOOT"],		bool_variables: ["BOARD_USES_RECOVERY_AS_BOOT"],
	properties: ["installable"],		properties: ["installable"],
	}		}

	@@ -317,9 +317,6 @@ soong_config_module_type {
	init_first_stage_cc_defaults {		init_first_stage_cc_defaults {
	name: "init_first_stage_defaults",		name: "init_first_stage_defaults",
	soong_config_variables: {		soong_config_variables: {
	BOARD_BUILD_SYSTEM_ROOT_IMAGE: {
	installable: false,
	},
	BOARD_USES_RECOVERY_AS_BOOT: {		BOARD_USES_RECOVERY_AS_BOOT: {
	installable: false,		installable: false,
	},		},

init/Android.mk

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -8,11 +8,9 @@ LOCAL_MODULE := init_vendor
	LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0		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_USES_RECOVERY_AS_BOOT),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_USES_RECOVERY_AS_BOOT
	endif # BOARD_BUILD_SYSTEM_ROOT_IMAGE
	include $(BUILD_PHONY_PACKAGE)		include $(BUILD_PHONY_PACKAGE)