diff options
author | 2015-09-17 17:39:38 +0000 | |
---|---|---|
committer | 2015-09-17 19:36:01 +0000 | |
commit | d31644256b8dde0f894cd57ac9d62bb01f598cbf (patch) | |
tree | 7a9462b8ebd2dc78312d6acc69ac20a0445fbd67 | |
parent | 083fe29f9b3b74a369cfe594247f89abe751ce97 (diff) |
Move all J2ObjC Bazel dependencies to third_party/java/j2objc.
--
MOS_MIGRATED_REVID=103303357
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java | 2 | ||||
-rw-r--r-- | third_party/BUILD | 1 | ||||
-rw-r--r-- | third_party/java/j2objc/BUILD | 12 | ||||
-rw-r--r-- | third_party/java_src/j2objc/jre_emul/BUILD | 40 |
4 files changed, 13 insertions, 42 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java index 822d1df3a4..c9c5f33630 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibraryBaseRule.java @@ -46,7 +46,7 @@ public class J2ObjcLibraryBaseRule implements RuleDefinition { <!-- #END_BLAZE_RULE.ATTRIBUTE -->*/ .add(attr("entry_classes", STRING_LIST)) .add(attr("$jre_emul_lib", LABEL) - .value(env.getLabel("//third_party/java_src/j2objc/jre_emul:jre_emul_lib"))) + .value(env.getLabel("//third_party/java/j2objc:jre_emul_lib"))) .build(); } diff --git a/third_party/BUILD b/third_party/BUILD index 838dd1d6ef..bb92ff6298 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -10,7 +10,6 @@ filegroup( "//third_party/java/j2objc:srcs", "//third_party/java/jarjar:srcs", "//third_party/java/jdk/langtools:srcs", - "//third_party/java_src/j2objc/jre_emul:srcs", "//third_party/py/concurrent:srcs", "//third_party/py/gflags:srcs", "//third_party/py/mock:srcs", diff --git a/third_party/java/j2objc/BUILD b/third_party/java/j2objc/BUILD index 62a6faaae0..1655261605 100644 --- a/third_party/java/j2objc/BUILD +++ b/third_party/java/j2objc/BUILD @@ -30,3 +30,15 @@ java_library( name = "annotations", srcs = ["@bazel-j2objc//:annotations"], ) + +objc_library( + name = "jre_emul_lib", + sdk_dylibs = [ + "libicucore", + "libz", + ], + sdk_frameworks = [ + "Security", + ], + deps = ["@bazel-j2objc//:jre_emul_archive"], +) diff --git a/third_party/java_src/j2objc/jre_emul/BUILD b/third_party/java_src/j2objc/jre_emul/BUILD deleted file mode 100644 index 9b302f9bea..0000000000 --- a/third_party/java_src/j2objc/jre_emul/BUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 2015 Google Inc. All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -licenses(["notice"]) # Apache License 2.0 - -# TODO(bazel-team): Move jre_emul Bazel targets to java, not java_src. -exports_files(["LICENSE"]) - -package( - default_visibility = ["//visibility:public"], -) - -filegroup( - name = "srcs", - srcs = glob(["**"]), - visibility = ["//third_party:__pkg__"], -) - -objc_library( - name = "jre_emul_lib", - sdk_dylibs = [ - "libicucore", - "libz", - ], - sdk_frameworks = [ - "Security", - ], - deps = ["@bazel-j2objc//:jre_emul_archive"], -) |