openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge commit '4f5e8cc3ca6da83f11bf42d04f1a57b9af16a582' into HEAD

This commit is contained in:
Bill Yi 2015-11-03 14:28:58 -08:00
parent a0975edc16 4f5e8cc3ca
commit af05ad919a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/version_defaults.mk
View File

@ -43,7 +43,7 @@ ifeq "" "$(PLATFORM_VERSION)"
# which is the version that we reveal to the end user.
# Update this value when the platform version changes (rather
# than overriding it somewhere else). Can be an arbitrary string.
PLATFORM_VERSION := 6.0
PLATFORM_VERSION := 6.0.1
endif
ifeq "" "$(PLATFORM_SDK_VERSION)"
@ -104,7 +104,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
# Can be an arbitrary string, but must be a single word.
#
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2015-10-01
PLATFORM_SECURITY_PATCH := 2015-12-01
endif
ifeq "" "$(PLATFORM_BASE_OS)"

4
tools/droiddoc/templates-sdk/sdkpage.cs
View File

@ -353,7 +353,7 @@ var:sdk.linux_download
<tr>
<!-- blank TD from Windows rowspan -->
<td>
<a onclick="return onDownload(this,false,true)"
<a onclick="return onDownload(this,false,true)" id="win-bundle-notools"
href="https://dl.google.com/dl/android/studio/install/<?cs var:studio.version ?>/<?cs var:studio.win_notools_exe_download ?>"
><?cs var:studio.win_notools_exe_download ?></a><br>(No SDK tools included)
</td>
@ -364,7 +364,7 @@ var:sdk.linux_download
<tr>
<!-- blank TD from Windows rowspan -->
<td>
<a onclick="return onDownload(this,false,true)"
<a onclick="return onDownload(this,false,true)" id="win-bundle-zip"
href="https://dl.google.com/dl/android/studio/ide-zips/<?cs var:studio.version ?>/<?cs var:studio.win_bundle_download ?>"
><?cs var:studio.win_bundle_download ?></a>
</td>