StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix parsing issues in board_config.mk" am: f482a6aa3a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1839200

Change-Id: I732f4aeea701961784ab3897fd1a2eda1440f049
This commit is contained in:
Treehugger Robot
2021-09-29 15:57:03 +00:00
committed by Automerger Merge Worker
parent 68b4fefd60 f482a6aa3a
commit c4b0e4f1cd
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/board_config.mk
View File

@@ -751,7 +751,7 @@ endef
ifdef BOARD_VNDK_VERSION ifdef BOARD_VNDK_VERSION
ifeq ($(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION)) ifeq ($(BOARD_VNDK_VERSION),$(PLATFORM_VNDK_VERSION))
$(error BOARD_VNDK_VERSION is equal to PLATFORM_VNDK_VERSION; use BOARD_VNDK_VERSION := current)) $(error BOARD_VNDK_VERSION is equal to PLATFORM_VNDK_VERSION; use BOARD_VNDK_VERSION := current)
endif endif
ifneq ($(BOARD_VNDK_VERSION),current) ifneq ($(BOARD_VNDK_VERSION),current)
$(call check_vndk_version,$(BOARD_VNDK_VERSION)) $(call check_vndk_version,$(BOARD_VNDK_VERSION))
@@ -809,8 +809,8 @@ $(foreach m,$(DEFAULT_WARNING_BUILD_MODULE_TYPES),\
$(KATI_deprecated_var $(m),Please convert to Soong))) $(KATI_deprecated_var $(m),Please convert to Soong)))
$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\ $(if $(filter true,$(BUILD_BROKEN_USES_BUILD_COPY_HEADERS)),\
$(KATI_deprecated_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers),\ $(KATI_deprecated_var BUILD_COPY_HEADERS,See $(CHANGES_URL)\#copy_headers),\
$(KATI_obsolete_var BUILD_COPY_HEADERS,See $(CHANGES_URL)#copy_headers)) $(KATI_obsolete_var BUILD_COPY_HEADERS,See $(CHANGES_URL)\#copy_headers))
$(foreach m,$(filter-out BUILD_COPY_HEADERS,$(DEFAULT_ERROR_BUILD_MODULE_TYPES)),\ $(foreach m,$(filter-out BUILD_COPY_HEADERS,$(DEFAULT_ERROR_BUILD_MODULE_TYPES)),\
$(if $(filter true,$(BUILD_BROKEN_USES_$(m))),\ $(if $(filter true,$(BUILD_BROKEN_USES_$(m))),\