From 80fa921cac81201c5840f98473af6b0c8d800548 Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 19 Jul 2017 23:07:50 +0200 Subject: Internal change PiperOrigin-RevId: 162532778 --- WORKSPACE | 7 +++++++ .../devtools/build/lib/bazel/rules/BazelRuleClassProvider.java | 8 -------- .../google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE | 8 -------- 3 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE diff --git a/WORKSPACE b/WORKSPACE index a86ba4e6b4..e7bf065e57 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -33,6 +33,13 @@ bind( actual = "//third_party/py/six", ) +new_http_archive( + name = "bazel_j2objc", + url = "https://github.com/google/j2objc/releases/download/1.0.1/j2objc-1.0.1.zip", + sha256 = "25cd1da1c2ca2f446bcd9e663da1e1776316547f4b14785709d07ce888c34d67", + build_file = __embedded_dir__ + "/embedded_tools/third_party/java/j2objc/BUILD.remote" +) + # For src/test/docker/... load("//src/test/docker:docker_repository.bzl", "docker_repository") docker_repository() diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index 86b5e20cad..a1907236d2 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -641,14 +641,6 @@ public class BazelRuleClassProvider { builder.addNativeAspectClass(j2ObjcAspect); builder.addRuleDefinition(new J2ObjcLibraryBaseRule()); builder.addRuleDefinition(new J2ObjcLibraryRule(j2ObjcAspect)); - - try { - builder.addWorkspaceFilePrefix( - ResourceFileLoader.loadResource( - BazelRuleClassProvider.class, "objc/j2objc.WORKSPACE")); - } catch (IOException e) { - throw new IllegalStateException(e); - } } @Override diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE b/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE deleted file mode 100644 index a2c860696c..0000000000 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/objc/j2objc.WORKSPACE +++ /dev/null @@ -1,8 +0,0 @@ -# External dependencies for the java_* rules. - -new_http_archive( - name = "bazel_j2objc", - url = "https://github.com/google/j2objc/releases/download/1.0.1/j2objc-1.0.1.zip", - sha256 = "25cd1da1c2ca2f446bcd9e663da1e1776316547f4b14785709d07ce888c34d67", - build_file = __embedded_dir__ + "/embedded_tools/third_party/java/j2objc/BUILD.remote" -) -- cgit v1.2.3