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

Commit 0de297d2 authored by Benoit Lamarche's avatar Benoit Lamarche Committed by android-build-merger
Browse files

resolve merge conflicts of e04c9416 to stage-aosp-master am: 0e61b466 

am: dd80dde8

Change-Id: Iff9f1ef1653a7a878dee9fb23dc7398e2b3805fc
parents ca9eca24 dd80dde8

core/version_defaults.mk

+1 −1
Original line number Original line Diff line number Diff line
@@ -81,7 +81,7 @@ ifeq "" "$(PLATFORM_JACK_MIN_SDK_VERSION)" 
  # PLATFORM_SDK_VERSION. During development, this number may be incremented

  # PLATFORM_SDK_VERSION. During development, this number may be incremented

  # before PLATFORM_SDK_VERSION if the plateform starts to add new java

  # before PLATFORM_SDK_VERSION if the plateform starts to add new java

  # language supports.

  # language supports.

  PLATFORM_JACK_MIN_SDK_VERSION := 25

  PLATFORM_JACK_MIN_SDK_VERSION := o-b1

endif

endif





ifeq "" "$(PLATFORM_VERSION_CODENAME)"

ifeq "" "$(PLATFORM_VERSION_CODENAME)"