From 8c5b647f52505b42ee1d677ec9effad4e8169998 Mon Sep 17 00:00:00 2001 From: jianglai Date: Fri, 13 Jul 2018 15:18:17 -0700 Subject: [PATCH] Run bazel installer as a argument to bash We used to set the installer as executable on X20 and have kokoro copy it to the temp folder and run it from there. Now that executables on x20 must be built verifiable, we cannot set the +x bit any more. Instead, run the script as an argument to the bash command. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=204536872 --- java/google/registry/xjc/BUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/google/registry/xjc/BUILD b/java/google/registry/xjc/BUILD index fc8cbd876..43a06ce8d 100644 --- a/java/google/registry/xjc/BUILD +++ b/java/google/registry/xjc/BUILD @@ -25,7 +25,7 @@ sh_binary( data = [ "bindings.xjb", "//java/google/registry/xml:xml_schema_files", - "@com_sun_xml_bind_jaxb_xjc//:XJCFacade", + "//third_party/jaxb:jaxb-xjc", ], ) @@ -38,7 +38,7 @@ genrule( outs = xjc_generated_files, cmd = " && ".join([ "REP=$$(pwd)", - "XJC=$$REP/$(location @com_sun_xml_bind_jaxb_xjc//:XJCFacade)", + "XJC=$$REP/$(location //third_party/jaxb:jaxb-xjc)", "OUT=$$REP/$(GENDIR)/java", "TMP=$$(mktemp -d $${TMPDIR:-/tmp}/jaxb.XXXXXXXXXX)", "mkdir -p $$OUT", @@ -52,7 +52,7 @@ genrule( "cd $$REP", "rm -rf $$TMP", ]), - tools = ["@com_sun_xml_bind_jaxb_xjc//:XJCFacade"], + tools = ["//third_party/jaxb:jaxb-xjc"], ) sh_binary(