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

Commit 0b1de05d authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Specialize oc-dev into OPR1" into oc-dev 

am: b70a9346

Change-Id: I488e308e863e7ea8ddbfe6f4d1a0588ebec016d5
parents 864955d1 b70a9346

core/version_defaults.mk

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


DEFAULT_PLATFORM_VERSION := OPR1

MIN_PLATFORM_VERSION := OPR1

MAX_PLATFORM_VERSION := PPR1

MAX_PLATFORM_VERSION := OPR1



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

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

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

PLATFORM_VERSION.OPR1 := O

PLATFORM_VERSION.PPR1 := P



# These are the current development codenames.

PLATFORM_VERSION_CODENAME.OPR1 := O

PLATFORM_VERSION_CODENAME.PPR1 := P



ifndef PLATFORM_VERSION

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