openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove RECOVERY_AS_BOOT check for init_first_stage 

This has kept adb_debug.prop from being installed.

Ignore-AOSP-First: fixes sc-release test breakage

Bug: 192432810
Test: build ramdisk-debug.img and see contents
Change-Id: I254579d2c6427213f40e9ae8e50d046e19390ba5
This commit is contained in:
Inseob Kim 2021-06-30 20:24:30 +09:00
parent 729e08f6ea
commit 94c2593ea0
2 changed files with 1 additions and 6 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",
module_type: "cc_defaults",
config_namespace: "ANDROID",
bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE", "BOARD_USES_RECOVERY_AS_BOOT"],
bool_variables: ["BOARD_BUILD_SYSTEM_ROOT_IMAGE"],
properties: ["installable"],
}
@ -269,9 +269,6 @@ init_first_stage_cc_defaults {
BOARD_BUILD_SYSTEM_ROOT_IMAGE: {
installable: false,
},
BOARD_USES_RECOVERY_AS_BOOT: {
installable: false,
},
},
}

2
init/Android.mk
View File

@ -9,10 +9,8 @@ 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)