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

Commit 9c5e7e24 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

Merge "oc-mr1-dev is OC-MR1, don't allow building beyond it" into oc-mr1-dev 

am: 09147785

Change-Id: Ib547b6f639967a83b85ccf7d617b655193dc4b4d
parents 711c3df3 09147785

core/version_defaults.mk

+1 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ endif 


DEFAULT_PLATFORM_VERSION := OPM1

MIN_PLATFORM_VERSION := OPM1

MAX_PLATFORM_VERSION := PPR1

MAX_PLATFORM_VERSION := OPM1



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

  $(MIN_PLATFORM_VERSION),\
@@ -74,12 +74,10 @@ endif 
# please add that PLATFORM_VERSION to the following text file:

# cts/tests/tests/os/assets/platform_versions.txt

PLATFORM_VERSION.OPM1 := OMR1

PLATFORM_VERSION.PPR1 := P



# 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.OPM1 := OMR1

PLATFORM_VERSION_CODENAME.PPR1 := P



ifndef PLATFORM_VERSION

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