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

Commit dd24d65d authored by Tao Bao's avatar Tao Bao Committed by Android (Google) Code Review
Browse files

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

parents eea3802b 295ad1f1

core/version_defaults.mk

+3 −3
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 := NMR1

  PLATFORM_VERSION := N

endif



ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -70,12 +70,12 @@ 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 := NMR1

  PLATFORM_VERSION_CODENAME := N



  # 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

  # codenames after PLATFORM_VERSION_CODENAME.

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME),N

  PLATFORM_VERSION_ALL_CODENAMES := $(PLATFORM_VERSION_CODENAME)

endif



ifeq "REL" "$(PLATFORM_VERSION_CODENAME)"