StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of e04c941 to stage-aosp-master

Browse Source 
Change-Id: I92ca7c5a10532220031dc799ad8900c9b20dc6fe
This commit is contained in:
Benoit Lamarche
2016-12-06 11:32:41 +01:00
parent 0deb783a52 e04c941668
commit 0e61b46673
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/version_defaults.mk
View File

@@ -64,7 +64,7 @@ ifeq "" "$(PLATFORM_JACK_MIN_SDK_VERSION)"
# PLATFORM_SDK_VERSION. During development, this number may be incremented
# before PLATFORM_SDK_VERSION if the plateform starts to add new java
# language supports.
PLATFORM_JACK_MIN_SDK_VERSION := 25
PLATFORM_JACK_MIN_SDK_VERSION := o-b1
endif
ifeq "" "$(PLATFORM_VERSION_CODENAME)"