diff options
| author |  Derek Sollenberger <djsollen@google.com> | 2017-06-27 11:55:05 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-27 16:32:15 +0000 |
| commit | 19b2a56ad7901796b2ee7af57f745d7c92c77e09 (patch) | |
| tree | df345674121b33044857e189a0461dda572da210 /infra/bots/assets | |
| parent | 52fb02edf2b9a1001ede37a33c00819de81dbdf4 (diff) | |
Upgrade android build (and infrastructure) to use ndk r15.
Bug: 6672
Change-Id: Ia6c6bae8a9adfd75172d7116487dfa63c3d69670
Reviewed-on: https://skia-review.googlesource.com/20904
Commit-Queue: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/assets')
| -rw-r--r-- | infra/bots/assets/android_ndk_darwin/VERSION | 2 | ||||
| -rwxr-xr-x | infra/bots/assets/android_ndk_darwin/create.py | 2 | ||||
| -rw-r--r-- | infra/bots/assets/android_ndk_linux/VERSION | 2 | ||||
| -rwxr-xr-x | infra/bots/assets/android_ndk_linux/create.py | 2 | ||||
| -rw-r--r-- | infra/bots/assets/android_ndk_windows/VERSION | 2 | ||||
| -rwxr-xr-x | infra/bots/assets/android_ndk_windows/create.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/infra/bots/assets/android_ndk_darwin/VERSION b/infra/bots/assets/android_ndk_darwin/VERSION index d8263ee986..bf0d87ab1b 100644 --- a/infra/bots/assets/android_ndk_darwin/VERSION +++ b/infra/bots/assets/android_ndk_darwin/VERSION @@ -1 +1 @@ -2
\ No newline at end of file +4
\ No newline at end of file diff --git a/infra/bots/assets/android_ndk_darwin/create.py b/infra/bots/assets/android_ndk_darwin/create.py index cd427d365d..1495e78dea 100755 --- a/infra/bots/assets/android_ndk_darwin/create.py +++ b/infra/bots/assets/android_ndk_darwin/create.py @@ -15,7 +15,7 @@ import os.path import shutil import subprocess -NDK_VER = "android-ndk-r14" +NDK_VER = "android-ndk-r15b" NDK_URL = \ "https://dl.google.com/android/repository/%s-darwin-x86_64.zip" % NDK_VER diff --git a/infra/bots/assets/android_ndk_linux/VERSION b/infra/bots/assets/android_ndk_linux/VERSION index c7930257df..9a037142aa 100644 --- a/infra/bots/assets/android_ndk_linux/VERSION +++ b/infra/bots/assets/android_ndk_linux/VERSION @@ -1 +1 @@ -7
\ No newline at end of file +10
\ No newline at end of file diff --git a/infra/bots/assets/android_ndk_linux/create.py b/infra/bots/assets/android_ndk_linux/create.py index d785f48958..79ab6d0a1a 100755 --- a/infra/bots/assets/android_ndk_linux/create.py +++ b/infra/bots/assets/android_ndk_linux/create.py @@ -15,7 +15,7 @@ import os.path import shutil import subprocess -NDK_VER = "android-ndk-r14" +NDK_VER = "android-ndk-r15b" NDK_URL = \ "https://dl.google.com/android/repository/%s-linux-x86_64.zip" % NDK_VER diff --git a/infra/bots/assets/android_ndk_windows/VERSION b/infra/bots/assets/android_ndk_windows/VERSION index e440e5c842..7813681f5b 100644 --- a/infra/bots/assets/android_ndk_windows/VERSION +++ b/infra/bots/assets/android_ndk_windows/VERSION @@ -1 +1 @@ -3
\ No newline at end of file +5
\ No newline at end of file diff --git a/infra/bots/assets/android_ndk_windows/create.py b/infra/bots/assets/android_ndk_windows/create.py index eb3cae50e2..063244b4d7 100755 --- a/infra/bots/assets/android_ndk_windows/create.py +++ b/infra/bots/assets/android_ndk_windows/create.py @@ -15,7 +15,7 @@ import os.path import shutil import subprocess -NDK_VER = "android-ndk-r14" +NDK_VER = "android-ndk-r15b" NDK_URL = \ "https://dl.google.com/android/repository/%s-windows-x86_64.zip" % NDK_VER |