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

Commit 9b3d6f91 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Move setting default BOARD_VNDK_VERSION value" into main

parents 7d2c5ff0 09aaa26c

core/config.mk

+0 −13
Original line number Diff line number Diff line
@@ -374,19 +374,6 @@ ANDROID_BUILDSPEC := $(TOPDIR)buildspec.mk 
endif

-include $(ANDROID_BUILDSPEC)



ifeq ($(KEEP_VNDK),true)

  # Starting in Android U, non-VNDK devices not supported

  # WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without

  # letting upstream know it's important to you, we may do cleanup which breaks this

  # significantly. Please let us know if you are changing this.

  ifndef BOARD_VNDK_VERSION

  # READ WARNING - DO NOT CHANGE

  BOARD_VNDK_VERSION := current

  # READ WARNING - DO NOT CHANGE

  endif

endif





# ---------------------------------------------------------------

# Define most of the global variables.  These are the ones that

# are specific to the user's build configuration.

core/envsetup.mk

+12 −0
Original line number Diff line number Diff line
@@ -57,6 +57,18 @@ else 
  KEEP_VNDK ?= true

endif



ifeq ($(KEEP_VNDK),true)

  # Starting in Android U, non-VNDK devices not supported

  # WARNING: DO NOT CHANGE: if you are downstream of AOSP, and you change this, without

  # letting upstream know it's important to you, we may do cleanup which breaks this

  # significantly. Please let us know if you are changing this.

  ifndef BOARD_VNDK_VERSION

  # READ WARNING - DO NOT CHANGE

  BOARD_VNDK_VERSION := current

  # READ WARNING - DO NOT CHANGE

  endif

endif



# ---------------------------------------------------------------

# Set up version information

include $(BUILD_SYSTEM)/version_util.mk