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

Commit 21873fbd authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

Merge "DO NOT MERGE OC-MR1 is REL" into oc-mr1-dev

am: 418b2914

Change-Id: Idfe46f6fb6b1aedae5a42445cd196204303c199b
parents d0905985 418b2914
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ PLATFORM_VERSION.OPM1 := 8.1.0

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

ifndef PLATFORM_VERSION
  PLATFORM_VERSION := $(PLATFORM_VERSION.$(TARGET_PLATFORM_VERSION))
@@ -175,7 +175,7 @@ else
    # assuming the device can only support APIs as of the previous official
    # public release.
    # This value will always be 0 for release builds.
    PLATFORM_PREVIEW_SDK_VERSION := 1
    PLATFORM_PREVIEW_SDK_VERSION := 0
  endif
endif