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

Commit c4b0e4f1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I732f4aeea701961784ab3897fd1a2eda1440f049
parents 68b4fefd f482a6aa

core/board_config.mk

+3 −3
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ endef 


ifdef BOARD_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

  ifneq ($(BOARD_VNDK_VERSION),current)

    $(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)))



$(if $(filter true,$(BUILD_BROKEN_USES_BUILD_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_deprecated_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)),\

  $(if $(filter true,$(BUILD_BROKEN_USES_$(m))),\