commit 27cfe38a62b73db44083ff9972649becff13a224
author David Pursehouse <dpursehouse@collab.net> Thu Sep 05 14:36:44 2019 +0900
committer David Pursehouse <dpursehouse@collab.net> Thu Sep 05 14:36:44 2019 +0900
tree d1d7b401e74dc3cd76499b4a716792e4d2e39ac7
parent 70c5e56b231a38176ad7556402390ef462e4e6b0
parent e463d69257a814e0ea19d4a7fe7c0779c0371bcf

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Add fixes for --incompatible_load_java_rules_from_bzl
  Bazel: Remove unnecessary 'include =' on java_library src parameter

Change-Id: Iaf3ef7bf348175629be9b9f2c94227db98e559a0

BUILD

diff --git a/BUILD b/BUILD
index 9e3a045..f75bad0 100644
--- a/BUILD
+++ b/BUILD
@@ -1,3 +1,4 @@
+load("@rules_java//java:defs.bzl", "java_library")
 load("//tools/bzl:junit.bzl", "junit_tests")
 load("//tools/bzl:plugin.bzl", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "gerrit_plugin")
 
@@ -23,7 +24,7 @@
     name = "testutils",
     testonly = 1,
     srcs = glob(
-        include = ["src/test/java/**/*.java"],
+        ["src/test/java/**/*.java"],
         exclude = [TEST_SRCS],
     ),
     deps = TEST_DEPS,