commit 89cfb7066d1a43280d68b23236c5d64331b5a22f
author Yun Peng <pcloudy@google.com> Mon May 25 06:55:22 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon May 25 06:57:32 2020 -0700
tree 92a04b58684e27f46f04df9d3d371e6c94bbabef
parent 37b3a09c468ea68ac880f08b5759f16572b51d4d

Fix proto compile and derived directory while bootstrapping from the original source

In Bazel's Debain build, we'll use Bazel's Java [bootstrap_toolchain](https://github.com/bazelbuild/bazel/blob/241d8c06e7a85d65e17cc8d4d623de5c22c9d29e/src/java_tools/buildjar/BUILD#L59) to build Bazel so that we don't need to download remote_java_tools_linux from internet. The bootstrap toolchain depends on the `derived` directory which contains all precompiled java proto files.

In this change:

- We parse `third_party/googleapis/BUILD.bazel` to find the exact proto files we need so that we don't compile all protos under third_party/googleapis. This helps avoid many unnecessary compiling errors.
- Recreate the derived directory from the proto compile output dir while bootstrapping from the original source so that the bootstrap toolchain can work.

Working towards: https://github.com/bazelbuild/bazel/issues/9408

Closes #11475.

PiperOrigin-RevId: 313070147

scripts/bootstrap/compile.sh

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 64f62f7..ec2ac82 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -21,8 +21,11 @@
 else
   PROTOBUF_JARS="/usr/share/java/protobuf.jar /usr/share/java/protobuf-java-util.jar"
 fi
-PROTO_FILES=$(find third_party/remoteapis third_party/googleapis third_party/pprof src/main/protobuf src/main/java/com/google/devtools/build/lib/buildeventstream/proto src/main/java/com/google/devtools/build/skyframe src/main/java/com/google/devtools/build/lib/skyframe/proto src/main/java/com/google/devtools/build/lib/bazel/debug src/main/java/com/google/devtools/build/lib/starlarkdebug/proto -name "*.proto")
-LIBRARY_JARS=$(find $PROTOBUF_JARS third_party -name '*.jar' | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -Fv third_party/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ")
+
+# Parse third_party/googleapis/BUILD.bazel to find the proto files we need to compile from googleapis
+GOOGLE_API_PROTOS="$(grep -o '".*\.proto"' third_party/googleapis/BUILD.bazel | sed 's/"//g' | sed 's|^|third_party/googleapis/|g')"
+PROTO_FILES=$(find third_party/remoteapis ${GOOGLE_API_PROTOS} third_party/pprof src/main/protobuf src/main/java/com/google/devtools/build/lib/buildeventstream/proto src/main/java/com/google/devtools/build/skyframe src/main/java/com/google/devtools/build/lib/skyframe/proto src/main/java/com/google/devtools/build/lib/bazel/debug src/main/java/com/google/devtools/build/lib/starlarkdebug/proto -name "*.proto")
+LIBRARY_JARS=$(find $PROTOBUF_JARS third_party -name '*.jar' | grep -Fv JavaBuilder | grep -Fv third_party/guava | grep -ve 'third_party/grpc/grpc.*jar' | tr "\n" " ")
 GRPC_JAVA_VERSION=1.20.0
 GRPC_LIBRARY_JARS=$(find third_party/grpc -name '*.jar' | grep -e ".*${GRPC_JAVA_VERSION}.*jar" | tr "\n" " ")
 GUAVA_VERSION=25.1
@@ -244,6 +247,12 @@
                 --plugin=protoc-gen-grpc="${GRPC_JAVA_PLUGIN-}" \
                 --grpc_out=${OUTPUT_DIR}/src "$f"
         done
+
+        # Recreate the derived directory
+        mkdir -p derived/src/java/build
+        mkdir -p derived/src/java/com
+        link_children ${OUTPUT_DIR}/src build derived/src/java
+        link_children ${OUTPUT_DIR}/src com derived/src/java
     fi
 
   java_compilation "Bazel Java" "$DIRS" "$EXCLUDE_FILES" "$LIBRARY_JARS" "${OUTPUT_DIR}"