Fix incorrect merged of https://bazel-review.googlesource.com/#/c/3921/
--
Change-Id: I4c9d749d2b4acb1254cd65efbabf4e6515924414
Reviewed-on: https://bazel-review.googlesource.com/#/c/3921/
MOS_MIGRATED_REVID=127074886
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD
index d5f0944..9430e54 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/junit4/BUILD
@@ -15,7 +15,6 @@
name = "runner",
testonly = 0, # TODO(bazel-team): make it testonly
srcs = glob(["runner/*.java"]),
- compatible_with = ["//buildenv/target:appengine"],
deps = [
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
index 484bf6c..2c9a488 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/internal/BUILD
@@ -3,7 +3,6 @@
java_library(
name = "internal",
srcs = glob(["*.java"]),
- compatible_with = ["//buildenv/target:appengine"],
deps = [
"//third_party:guava",
"//third_party:jsr330_inject",
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
index b70d6d8..819ad9f 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/junit4/BUILD
@@ -13,7 +13,6 @@
["*.java"],
exclude = ["RegExTestCaseFilter.java"],
),
- compatible_with = ["//buildenv/target:appengine"],
deps = [
":filter",
"//src/java_tools/junitrunner/java/com/google/testing/junit/junit4:runner",
@@ -33,7 +32,6 @@
java_library(
name = "filter",
srcs = ["RegExTestCaseFilter.java"],
- compatible_with = ["//buildenv/target:appengine"],
deps = [
"//third_party:guava",
"//third_party:junit4",
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD
index cd15022..18e37d1 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/model/BUILD
@@ -3,7 +3,6 @@
java_library(
name = "model",
srcs = glob(["*.java"]),
- compatible_with = ["//buildenv/target:appengine"],
deps = [
"//src/java_tools/junitrunner/java/com/google/testing/junit/junit4:runner",
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding",
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD
index 502c3b7..8c4c4a0 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/BUILD
@@ -11,7 +11,6 @@
java_library(
name = "sharding",
srcs = glob(["*.java"]),
- compatible_with = ["//buildenv/target:appengine"],
deps = [
"//src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api",
"//third_party:guava",
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD
index f262b70..6c1ed76 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/sharding/api/BUILD
@@ -11,7 +11,6 @@
java_library(
name = "api",
srcs = glob(["*.java"]),
- compatible_with = ["//buildenv/target:appengine"],
deps = [
"//third_party:junit4",
],
diff --git a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD
index a98ccec..c176a80 100644
--- a/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD
+++ b/src/java_tools/junitrunner/java/com/google/testing/junit/runner/util/BUILD
@@ -10,7 +10,6 @@
java_library(
name = "util",
srcs = glob(["*.java"]),
- compatible_with = ["//buildenv/target:appengine"],
deps = [
"//third_party:guava",
"//third_party:jsr305",
diff --git a/third_party/README.md b/third_party/README.md
index ace9fd7..67c3f07 100644
--- a/third_party/README.md
+++ b/third_party/README.md
@@ -173,7 +173,7 @@
## [javac](https://github.com/google/error-prone-javac)
* Version: 1.9.0-dev-r2973-2 (javac7.jar) and 1.9.0-dev-r2644-2 (javac.jar)
-* License: GNU GPL v2 with Classpath exception
+* License: GNU GPL v2 with Classpath exception (plus other licenses, see third_party/java/jdk/langtools/LICENSE file).
## [jarjar](https://code.google.com/p/jarjar/)
diff --git a/third_party/java/jdk/langtools/BUILD b/third_party/java/jdk/langtools/BUILD
index 055a02f..9a44df1 100644
--- a/third_party/java/jdk/langtools/BUILD
+++ b/third_party/java/jdk/langtools/BUILD
@@ -12,11 +12,13 @@
srcs = select({
"//tools/jdk:jdk7": [
"BUILD",
+ "LICENSE",
"javac7.jar",
"javac7.srcjar",
],
"//conditions:default": [
"BUILD",
+ "LICENSE",
"javac.jar",
"javac.srcjar",
],
