Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update NDK to r21d #375

Merged
merged 1 commit into from
Jul 9, 2020
Merged

Update NDK to r21d #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions BUILDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ cd <path-to-agi-source>
bazel build pkg
```

> :warning: We currently use NDK r21 to have access to the unified Khronos
> validation layer. Bazel 2.0.0 has no official support for r21, so **the
> :warning: We currently use NDK r21d to have access to the unified Khronos
> validation layer. Bazel 2.0.0 has no official support for r21d, so **the
> following build warning is expected and can be ignored:**
>
> ```
Expand Down Expand Up @@ -86,7 +86,7 @@ tools\bin\sdkmanager.bat platform-tools
```

Unzip the
[Android NDK **r21**](https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip)
[Android NDK **r21d**](https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip)
into a directory of your choosing, and set the `ANDROID_NDK_HOME` environment
variable to point to this directory.

Expand Down Expand Up @@ -153,7 +153,7 @@ tools/bin/sdkmanager platform-tools
```

Unzip the
[Android NDK **r21**](https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip)
[Android NDK **r21d**](https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip)
into a directory of your choosing, and set the `ANDROID_NDK_HOME` environment
variable to point to this directory:

Expand Down Expand Up @@ -229,7 +229,7 @@ tools/bin/sdkmanager platform-tools
```

Unzip the
[Android NDK **r21**](https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip)
[Android NDK **r21d**](https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip)
into a directory of your choosing, and set the `ANDROID_NDK_HOME` environment
variable to point to this directory:

Expand Down
6 changes: 3 additions & 3 deletions kokoro/linux/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ sudo apt-get -qy install gcc-8 g++-8
export CC=/usr/bin/gcc-8

# Get the Android NDK
curl -L -k -O -s https://dl.google.com/android/repository/android-ndk-r21-linux-x86_64.zip
unzip -q android-ndk-r21-linux-x86_64.zip
export ANDROID_NDK_HOME=$PWD/android-ndk-r21
curl -L -k -O -s https://dl.google.com/android/repository/android-ndk-r21d-linux-x86_64.zip
unzip -q android-ndk-r21d-linux-x86_64.zip
export ANDROID_NDK_HOME=$PWD/android-ndk-r21d

# Get recent build tools
echo y | $ANDROID_HOME/tools/bin/sdkmanager --install 'build-tools;29.0.2'
Expand Down
6 changes: 3 additions & 3 deletions kokoro/macos/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ curl -L -k -O -s https://dl.google.com/android/repository/tools_r25.2.3-macosx.z
mkdir android
unzip -q tools_r25.2.3-macosx.zip -d android
echo y | ./android/tools/bin/sdkmanager build-tools\;29.0.2 platforms\;android-26
curl -L -k -O -s https://dl.google.com/android/repository/android-ndk-r21-darwin-x86_64.zip
unzip -q android-ndk-r21-darwin-x86_64.zip -d android
curl -L -k -O -s https://dl.google.com/android/repository/android-ndk-r21d-darwin-x86_64.zip
unzip -q android-ndk-r21d-darwin-x86_64.zip -d android
export ANDROID_HOME=$PWD/android
export ANDROID_NDK_HOME=$PWD/android/android-ndk-r21
export ANDROID_NDK_HOME=$PWD/android/android-ndk-r21d

# Get the JDK and JRE from our mirror. This needs to be after the Android updates above (needs 1.8).
JDK_BUILD=zulu11.39.15-ca
Expand Down
7 changes: 3 additions & 4 deletions kokoro/windows/build.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,10 @@ REM Install Android SDK platform, build tools and NDK
setlocal
call %ANDROID_HOME%\tools\bin\sdkmanager.bat platforms;android-26 build-tools;29.0.2
endlocal
echo on

wget -q https://dl.google.com/android/repository/android-ndk-r21-windows-x86_64.zip
unzip -q android-ndk-r21-windows-x86_64.zip
set ANDROID_NDK_HOME=%CD%\android-ndk-r21
wget -q https://dl.google.com/android/repository/android-ndk-r21d-windows-x86_64.zip
unzip -q android-ndk-r21d-windows-x86_64.zip
set ANDROID_NDK_HOME=%CD%\android-ndk-r21d

REM Install WiX Toolset.
wget -q https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311-binaries.zip
Expand Down
2 changes: 1 addition & 1 deletion tools/build/rules/android.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ ndk_vk_validation_layer = repository_rule(
# Enforce NDK version by checking $ANDROID_NDK_HOME/source.properties
def _ndk_version_check(repository_ctx):
# This should be updated in sync with BUILDING.md documentation
expectedVersion = "21.0.6113669"
expectedVersion = "21.3.6528147"

# Extract NDK version string from $ANDROID_NDK_HOME/source.properties,
# which has the following format:
Expand Down