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

Commit 68cd8464 authored by Ian Pedowitz's avatar Ian Pedowitz Committed by android-build-merger
Browse files

Merge "Revert "O is API 26."" into oc-dev am: 6f93dd52 

am: f94c2ef5

Change-Id: I146d19b568a2b8650f05c5f2ea86e8639c19227b
parents 832e7d64 f94c2ef5

core/version_defaults.mk

+2 −2
Original line number Diff line number Diff line
@@ -111,14 +111,14 @@ ifndef PLATFORM_SDK_VERSION 
  # When you increment the PLATFORM_SDK_VERSION please ensure you also

  # clear out the following text file of all older PLATFORM_VERSION's:

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

  PLATFORM_SDK_VERSION := 26

  PLATFORM_SDK_VERSION := 25

endif



ifndef PLATFORM_JACK_MIN_SDK_VERSION

  # This is definition of the min SDK version given to Jack for the current

  # platform. For released version it should be the same as

  # PLATFORM_SDK_VERSION. During development, this number may be incremented

  # before PLATFORM_SDK_VERSION if the platform starts to add new java

  # before PLATFORM_SDK_VERSION if the plateform starts to add new java

  # language supports.

  PLATFORM_JACK_MIN_SDK_VERSION := o-b1

endif