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

Commit 216b1ed2 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1""" into nyc-mr1-dev

parents 6af05e73 a9bc0520

core/version_defaults.mk

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ ifeq "" "$(PLATFORM_VERSION)" 
  # which is the version that we reveal to the end user.

  # Update this value when the platform version changes (rather

  # than overriding it somewhere else).  Can be an arbitrary string.

  PLATFORM_VERSION := N

  PLATFORM_VERSION := NMR1

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -70,7 +70,7 @@ endif 
ifeq "" "$(PLATFORM_VERSION_CODENAME)"

  # This is the current development code-name, if the build is not a final

  # release build.  If this is a final release build, it is simply "REL".

  PLATFORM_VERSION_CODENAME := N

  PLATFORM_VERSION_CODENAME := NMR1



  # This is all of the development codenames that are active.  Should be either

  # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional