ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Change-Id: Ia948bc1aa191c5170536b6c865699cab5a39fab6
This commit is contained in:
Treehugger Robot 2021-07-15 09:03:15 +00:00 • committed by Automerger Merge Worker
commit eafdcd0b27
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
init/Android.bp
View file

@ -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,
},
}, },
} }

2
init/Android.mk
View file

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