commit 7fb242d404962666636bb77e05845e7f2217381c
author iirina <elenairina@google.com> Tue Mar 12 06:30:14 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 12 06:31:25 2019 -0700
tree 61f7ed6c5649daa25b7add2c157bb10c2de7bb91
parent 333c8c337b12f4fcc2c3471c80bf18c1ea113342

Use BUILD.pkg instead of BUILD-new.pkg

`BUILD-new.pkg` was added as an intermediate BUILD.pkg file in order to facilitate a new data structure in the remote tools archive. It is not longer needed.

Progress on #6316.

Closes #7694.

PiperOrigin-RevId: 238002273

scripts/bootstrap/compile.sh

diff --git a/scripts/bootstrap/compile.sh b/scripts/bootstrap/compile.sh
index 8a890eb..3d53c3f 100755
--- a/scripts/bootstrap/compile.sh
+++ b/scripts/bootstrap/compile.sh
@@ -265,7 +265,7 @@
   link_children "${PWD}" tools "${BAZEL_TOOLS_REPO}"
 
   # The BUILD file needed for @remote_java_tools.
-  link_file "${PWD}/third_party/java/java_tools/BUILD-new.pkg" "${BAZEL_TOOLS_REPO}/tools/jdk/BUILD.pkg"
+  link_file "${PWD}/third_party/java/java_tools/BUILD.pkg" "${BAZEL_TOOLS_REPO}/tools/jdk/BUILD.pkg"
 
   # Set up @bazel_tools//platforms properly
   mkdir -p ${BAZEL_TOOLS_REPO}/platforms

src/create_embedded_tools.py

diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index 1a4dba2..c4ec47b 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -35,7 +35,7 @@
      lambda x: 'tools/cpp/runfiles/' + os.path.basename(x)[len('generated_'):]),
     ('*jarjar_command_deploy.jar',
      lambda x: 'tools/jdk/jarjar_command_deploy.jar'),
-    ('*BUILD-new.pkg', lambda x: 'tools/jdk/BUILD.pkg'),
+    ('*BUILD.pkg', lambda x: 'tools/jdk/BUILD.pkg'),
     ('*BUILD.javalangtools', lambda x: 'third_party/java/jdk/langtools/BUILD'),
     ('*singlejar_local.exe', lambda x: 'tools/jdk/singlejar/singlejar.exe'),
     ('*singlejar_local', lambda x: 'tools/jdk/singlejar/singlejar'),