Skip to content

Commit

Permalink
Use BUILD.pkg instead of BUILD-new.pkg
Browse files Browse the repository at this point in the history
`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
  • Loading branch information
iirina authored and copybara-github committed Mar 12, 2019
1 parent 333c8c3 commit 7fb242d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/bootstrap/compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ EOF
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
Expand Down
2 changes: 1 addition & 1 deletion src/create_embedded_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down

0 comments on commit 7fb242d

Please sign in to comment.