Skip to content

Commit a47266e

Browse files
committed
kokoro: Avoid --include-build for Android
Since 4369e8c the --include-build just opens us up to trouble with accidentally building the protoc plugin. Since we're going to do a ./gradlew install anyway, let's just wait until after that point for building cronet. This sort of problem was experienced while developing #4369.
1 parent 9f62708 commit a47266e

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

buildscripts/kokoro/android.sh

+9-7
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,6 @@ cat /VERSION
55

66
BASE_DIR="$(pwd)"
77

8-
# Build Cronet
9-
10-
cd "$BASE_DIR/github/grpc-java/cronet"
11-
./cronet_deps.sh
12-
../gradlew --include-build .. build
13-
14-
158
# Install gRPC and codegen for the Android examples
169
# (a composite gradle build can't find protoc-gen-grpc-java)
1710

@@ -30,6 +23,15 @@ ln -s "/tmp/protobuf-${PROTOBUF_VERSION}/$(uname -s)-$(uname -p)" /tmp/protobuf
3023

3124
./gradlew install
3225

26+
# Build Cronet
27+
28+
pushd cronet
29+
./cronet_deps.sh
30+
../gradlew build
31+
popd
32+
33+
# Build examples
34+
3335
cd ./examples/android/clientcache
3436
./gradlew build
3537
cd ../routeguide

0 commit comments

Comments
 (0)