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

Commit 19096a24 authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Master is now S"

parents cac826f4 4fb98e9d

core/version_defaults.mk

+5 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ ifdef INTERNAL_BUILD_ID_MAKEFILE 
  include $(INTERNAL_BUILD_ID_MAKEFILE)

endif



DEFAULT_PLATFORM_VERSION := RP1A

MIN_PLATFORM_VERSION := RP1A

MAX_PLATFORM_VERSION := RP1A

DEFAULT_PLATFORM_VERSION := SP1A

MIN_PLATFORM_VERSION := SP1A

MAX_PLATFORM_VERSION := SP1A



ALLOWED_VERSIONS := $(call allowed-platform-versions,\

  $(MIN_PLATFORM_VERSION),\
@@ -85,10 +85,12 @@ MAX_PLATFORM_VERSION := 
# unreleased API level targetable by this branch, not just those that are valid

# lunch targets for this branch.

PLATFORM_VERSION.RP1A := R

PLATFORM_VERSION.SP1A := S



# These are the current development codenames, if the build is not a final

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

PLATFORM_VERSION_CODENAME.RP1A := R

PLATFORM_VERSION_CODENAME.SP1A := S



ifndef PLATFORM_VERSION

  PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))