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

Commit b22b5721 authored by Colin Cross's avatar Colin Cross
Browse files

Unspecialize oc-dev-plus-aosp 

oc-dev-plus-aosp will become aosp master, which needs to continue to
be able to build features targeted at PPR1.

This reverts commit 096aaeee.

Bug: 36891159
Test: builds
Change-Id: I7060a5742609e96102027eea528e0e2db8e7b129
Merged-In: I546d1c25a2b1d948a0e7da796f59e734a98635da
parent bd98d429

core/version_defaults.mk

+4 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ endif 


DEFAULT_PLATFORM_VERSION := OPR1

MIN_PLATFORM_VERSION := OPR1

MAX_PLATFORM_VERSION := OPR1

MAX_PLATFORM_VERSION := PPR1



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

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

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

PLATFORM_VERSION.OPR1 := 8.0.0

PLATFORM_VERSION.PPR1 := P



# 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.OPR1 := REL

PLATFORM_VERSION_CODENAME.OPR1 := O

PLATFORM_VERSION_CODENAME.PPR1 := P



ifndef PLATFORM_VERSION

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