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

Revert "Throw an error if androidboot.hardware is used for bootconfig" 

This reverts commit 2e43e34d53.

The kernel bootconfig feature has been updated to handle mixed subkeys
and values, so androidboot.hardware is ok to use now.

Test: build and boot cuttlefish with 'hardware=cutf_vm'
Test: build and boot cuttlefish with 'androidboot.hardware=cutf_vm'
Bug: 191502832
Merged-In: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
Change-Id: I7c3f330a73abe6cf1fb7d14aaaa6cbc3e874a4aa
This commit is contained in:
Devin Moore 2021-06-18 08:22:50 -07:00
parent 122a00734b
commit 36b659550e
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/Makefile
View File

@ -1117,11 +1117,6 @@ ifdef INTERNAL_KERNEL_CMDLINE
endif endif
ifdef INTERNAL_BOOTCONFIG ifdef INTERNAL_BOOTCONFIG
ifneq (,$(findstring androidboot.hardware=, $(INTERNAL_BOOTCONFIG)))
$(error "androidboot.hardware" BOOTCONFIG parameter is not supported due \
to bootconfig limitations. Use "hardware" instead. INTERNAL_BOOTCONFIG: \
$(INTERNAL_BOOTCONFIG))
endif
INTERNAL_VENDOR_BOOTCONFIG_TARGET := $(PRODUCT_OUT)/vendor-bootconfig.img INTERNAL_VENDOR_BOOTCONFIG_TARGET := $(PRODUCT_OUT)/vendor-bootconfig.img
$(INTERNAL_VENDOR_BOOTCONFIG_TARGET): $(INTERNAL_VENDOR_BOOTCONFIG_TARGET):
rm -f $@ rm -f $@