flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kokoro: Adjust android CIs to work with Ubuntu 22.04 image 

It doesn't have Android SDK nor the VERSION file. See also d654707838
This commit is contained in:
Eric Anderson 2024-07-08 09:06:33 -07:00
parent 77b3bb77ef
commit 0ff3f8e4ac
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
buildscripts/kokoro/android-interop.sh
View File

@ -1,9 +1,6 @@
#!/bin/bash
set -exu -o pipefail
if [[ -f /VERSION ]]; then
cat /VERSION
fi
# Install gRPC and codegen for the Android interop app
# (a composite gradle build can't find protoc-gen-grpc-java)
@ -16,7 +13,14 @@ export CXXFLAGS=-I/tmp/protobuf/include
export LD_LIBRARY_PATH=/tmp/protobuf/lib
export OS_NAME=$(uname)
(yes || true) | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses
export ANDROID_HOME=/tmp/Android/Sdk
mkdir -p "${ANDROID_HOME}/cmdline-tools"
curl -Ls -o cmdline.zip \
"https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip"
unzip -qd "${ANDROID_HOME}/cmdline-tools" cmdline.zip
rm cmdline.zip
mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest"
(yes || true) | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" --licenses
# Proto deps
buildscripts/make_dependencies.sh

10
buildscripts/kokoro/android.sh
View File

@ -1,7 +1,6 @@
#!/bin/bash
set -exu -o pipefail
cat /VERSION
BASE_DIR="$(pwd)"
@ -23,7 +22,14 @@ cat <<EOF >> gradle.properties
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=1024m
EOF
(yes || true) | "${ANDROID_HOME}/tools/bin/sdkmanager" --licenses
export ANDROID_HOME=/tmp/Android/Sdk
mkdir -p "${ANDROID_HOME}/cmdline-tools"
curl -Ls -o cmdline.zip \
"https://dl.google.com/android/repository/commandlinetools-linux-9477386_latest.zip"
unzip -qd "${ANDROID_HOME}/cmdline-tools" cmdline.zip
rm cmdline.zip
mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest"
(yes || true) | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" --licenses
# Proto deps
buildscripts/make_dependencies.sh