Skip to content

Commit d124007

Browse files
authored
kokoro: Don't run grpc codegen in android-interop (#12098)
android-interop has been failing to build since 46485c8 because it didn't have cmake installed and defined LDFLAGS/CXXFLAGS with pkg-config before make_dependencies.sh had been run. Android-interop didn't verify the codegen is up-to-date. Building the codegen was just a relic from when android was its own separate gradle build. Avoiding codegen means we don't have to compile absl/protobuf and have a C++ toolchain.
1 parent 46485c8 commit d124007

File tree

1 file changed

+1
-12
lines changed

1 file changed

+1
-12
lines changed

buildscripts/kokoro/android-interop.sh

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,8 @@
22

33
set -exu -o pipefail
44

5-
# Install gRPC and codegen for the Android interop app
6-
# (a composite gradle build can't find protoc-gen-grpc-java)
7-
85
cd github/grpc-java
96

10-
export LDFLAGS="$(PKG_CONFIG_PATH=/tmp/protobuf/lib/pkgconfig pkg-config --libs protobuf)"
11-
export CXXFLAGS="$(PKG_CONFIG_PATH=/tmp/protobuf/lib/pkgconfig pkg-config --cflags protobuf)"
12-
export LD_LIBRARY_PATH=/tmp/protobuf/lib
13-
export OS_NAME=$(uname)
14-
157
export ANDROID_HOME=/tmp/Android/Sdk
168
mkdir -p "${ANDROID_HOME}/cmdline-tools"
179
curl -Ls -o cmdline.zip \
@@ -21,15 +13,12 @@ rm cmdline.zip
2113
mv "${ANDROID_HOME}/cmdline-tools/cmdline-tools" "${ANDROID_HOME}/cmdline-tools/latest"
2214
(yes || true) | "${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager" --licenses
2315

24-
# Proto deps
25-
buildscripts/make_dependencies.sh
26-
2716
# Build Android with Java 11, this adds it to the PATH
2817
sudo update-java-alternatives --set java-1.11.0-openjdk-amd64
2918
# Unset any existing JAVA_HOME env var to stop Gradle from using it
3019
unset JAVA_HOME
3120

32-
GRADLE_FLAGS="-Pandroid.useAndroidX=true -Dorg.gradle.jvmargs=-Xmx1024m"
21+
GRADLE_FLAGS="-Pandroid.useAndroidX=true -Dorg.gradle.jvmargs=-Xmx1024m -PskipCodegen=true"
3322

3423
./gradlew $GRADLE_FLAGS :grpc-android-interop-testing:assembleDebug
3524
./gradlew $GRADLE_FLAGS :grpc-android-interop-testing:assembleDebugAndroidTest

0 commit comments

Comments
 (0)