diff options
| author |  Mike Klein <mtklein@chromium.org> | 2018-05-14 13:25:46 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-05-14 18:48:19 +0000 |
| commit | 8803ebb470e73a5738cd09c48adbafec062229a8 (patch) | |
| tree | 7f3a6c5acfcfc8a147d8edd07f225252b4bead87 /infra/bots/assets | |
| parent | 45a6d7159e7c5a03c4191610ff981dd7fc2be7b4 (diff) | |
update to NDK r17
We haven't done this in a while.
The only interesting change I've noticed so far is that we no longer
need to link libandroid_support when targeting API 21+.
Change-Id: I6506fbe7bd02534f1ea136f2164acab7f44c29e0
Reviewed-on: https://skia-review.googlesource.com/128009
Reviewed-by: Derek Sollenberger <djsollen@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>
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 bf0d87ab1b..7813681f5b 100644 --- a/infra/bots/assets/android_ndk_darwin/VERSION +++ b/infra/bots/assets/android_ndk_darwin/VERSION @@ -1 +1 @@ -4
\ No newline at end of file +5
\ 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 1495e78dea..809f755e2d 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-r15b" +NDK_VER = "android-ndk-r17" 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 9a037142aa..9d607966b7 100644 --- a/infra/bots/assets/android_ndk_linux/VERSION +++ b/infra/bots/assets/android_ndk_linux/VERSION @@ -1 +1 @@ -10
\ No newline at end of file +11
\ 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 79ab6d0a1a..2af2905b1b 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-r15b" +NDK_VER = "android-ndk-r17" 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 7813681f5b..62f9457511 100644 --- a/infra/bots/assets/android_ndk_windows/VERSION +++ b/infra/bots/assets/android_ndk_windows/VERSION @@ -1 +1 @@ -5
\ No newline at end of file +6
\ 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 063244b4d7..9336a5edfa 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-r15b" +NDK_VER = "android-ndk-r17" NDK_URL = \ "https://dl.google.com/android/repository/%s-windows-x86_64.zip" % NDK_VER |