commit 3d994df2361aaca9eb756406bccfe939964a1568
author Googler <noreply@google.com> Thu Feb 11 07:23:35 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Thu Feb 11 07:24:42 2021 -0800
tree eaf436969be1b4de6ea2ee6a0873e5286ebabf4d
parent a61db82878d7601ec107b26a7dff283f9c3157e7

Fix a bug where create_embedded_tools.py can't find openjdk files when the sibling repository layout is enabled.

PiperOrigin-RevId: 356968731

src/create_embedded_tools.py

diff --git a/src/create_embedded_tools.py b/src/create_embedded_tools.py
index caaa34c..8abdf92 100644
--- a/src/create_embedded_tools.py
+++ b/src/create_embedded_tools.py
@@ -49,8 +49,12 @@
     ('*xcode*realpath', lambda x: 'tools/objc/realpath'),
     ('*xcode*xcode-locator', lambda x: 'tools/objc/xcode-locator'),
     ('*src/tools/xcode/*', lambda x: 'tools/objc/' + os.path.basename(x)),
+    # --experimental_sibling_repository_layout=false
     ('*external/openjdk_*/file/*.tar.gz', lambda x: 'jdk.tar.gz'),
     ('*external/openjdk_*/file/*.zip', lambda x: 'jdk.zip'),
+    # --experimental_sibling_repository_layout=true
+    ('*openjdk_*/file/*.tar.gz', lambda x: 'jdk.tar.gz'),
+    ('*openjdk_*/file/*.zip', lambda x: 'jdk.zip'),
     ('*src/minimal_jdk.tar.gz', lambda x: 'jdk.tar.gz'),
     ('*src/minimal_jdk.zip', lambda x: 'jdk.zip'),
     ('*.bzl.tools', lambda x: x[:-6]),