Skip to content
Permalink
Browse files

Move j2cl_library native_srcs to srcs since srcs already handles nati…

…ve_srcs.

Tested:
    TAP --sample ran all affected tests and none failed
    http://test/OCL:254452464:BASE:255280370:1561600871753:56501ff6
PiperOrigin-RevId: 255466613
  • Loading branch information...
gkdn authored and Copybara-Service committed Jun 27, 2019
1 parent 4348fd3 commit ee2a989ebab0f032791e697978845d5bef8ba44e
Showing with 71 additions and 45 deletions.
  1. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/bridgejsmethod/BUILD
  2. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/instancejsmethods/BUILD
  3. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/jsfunctiontypeannotation/BUILD
  4. +1 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/jsinteroptests/BUILD
  5. +4 −4 transpiler/javatests/com/google/j2cl/transpiler/integration/jsmethodoverride/BUILD
  6. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/jsproperties/BUILD
  7. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/jstypevarargs/BUILD
  8. +8 −4 transpiler/javatests/com/google/j2cl/transpiler/integration/nativeinjection/BUILD
  9. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/nativeinjectionwithoutmethods/BUILD
  10. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/removeunusedcontructorprops/BUILD
  11. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/renamejsmethodsinnativejstype/BUILD
  12. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/integration/staticinitfailfast/BUILD
  13. +5 −3 transpiler/javatests/com/google/j2cl/transpiler/readable/externs/BUILD
  14. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/readable/jsenum/BUILD
  15. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/readable/jsfunction/BUILD
  16. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/readable/nativeinjection/BUILD
  17. +1 −6 transpiler/javatests/com/google/j2cl/transpiler/readable/readable_example.bzl
  18. +4 −2 transpiler/javatests/com/google/j2cl/transpiler/regression/java8/BUILD
@@ -13,7 +13,9 @@ load(
# blaze test :uncompiled_test
integration_test(
name = "bridgejsmethod",
srcs = glob(["*.java"]),
native_srcs = ["Main.native.js"],
srcs = glob([
"*.java",
"*.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -43,8 +43,10 @@ j2cl_library(
# blaze test :uncompiled_test
integration_test(
name = "instancejsmethods",
srcs = ["Main.java"],
native_srcs = ["Main.native.js"],
srcs = [
"Main.java",
"Main.native.js",
],
deps = [
":Child",
":MyInterface",
@@ -13,8 +13,10 @@ load(
# blaze test :uncompiled_test
integration_test(
name = "jsfunctiontypeannotation",
srcs = glob(["*.java"]),
native_srcs = ["Main.native.js"],
srcs = glob([
"*.java",
"*.js",
]),
suppress = ["JSC_TYPE_MISMATCH"],
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -15,10 +15,9 @@ integration_test(
name = "jsinteroptests",
srcs = glob([
"**/*.java",
"native_types/*.js",
"**/*.js",
]),
main_class = "woo.Main",
native_srcs = glob(["*.native.js"]),
deps = [
"//third_party:closure_reflect",
"//third_party:gwt-jsinterop-annotations-j2cl",
@@ -13,9 +13,9 @@ load(
# blaze test :uncompiled_test
integration_test(
name = "jsmethodoverride",
srcs = glob(["*.java"]),
native_srcs = [
"Main.native.js",
],
srcs = glob([
"*.java",
"*.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -13,7 +13,9 @@ load(
# blaze test :uncompiled_test
integration_test(
name = "jsproperties",
srcs = glob(["*.java"]),
native_srcs = glob(["*.native.js"]),
srcs = glob([
"*.java",
"*.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -13,7 +13,9 @@ load(
# blaze test :uncompiled_test
integration_test(
name = "jstypevarargs",
srcs = glob(["*.java"]),
native_srcs = ["Main.native.js"],
srcs = glob([
"*.java",
"*.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -10,8 +10,10 @@ load(

j2cl_library(
name = "superinject",
srcs = glob(["super/**/*.java"]),
native_srcs = glob(["super/**/*.native.js"]),
srcs = glob([
"super/**/*.java",
"super/**/*.native.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)

@@ -21,8 +23,10 @@ j2cl_library(
# blaze test :uncompiled_test
integration_test(
name = "nativeinjection",
srcs = glob(["*.java"]),
native_srcs = ["NativeClass.native.js"],
srcs = glob([
"*.java",
"*.js",
]),
deps = [
":superinject",
"//third_party:gwt-jsinterop-annotations-j2cl",
@@ -13,7 +13,9 @@ load(
# blaze test :uncompiled_test
integration_test(
name = "nativeinjection",
srcs = glob(["*.java"]),
native_srcs = ["MyClass.native.js"],
srcs = glob([
"*.java",
"*.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -13,7 +13,9 @@ load(
# blaze test :uncompiled_test
integration_test(
name = "removeunusedcontructorprops",
srcs = glob(["**/*.java"]),
native_srcs = ["Main.native.js"],
srcs = glob([
"*.java",
"*.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -28,8 +28,10 @@ integration_test(
name = "renamejsmethodsinnativejstype",
# Src's JUST the Main class and gets Foo as a dependency. Do not
# change this since this is part of what the test is verifying.
srcs = ["Main.java"],
native_srcs = ["Main.native.js"],
srcs = [
"Main.java",
"Main.native.js",
],
deps = [
":foo",
":native_types",
@@ -9,7 +9,9 @@ load(

integration_test(
name = "staticinitfailfast",
srcs = glob(["*.java"]),
native_srcs = glob(["*.native.js"]),
srcs = glob([
"*.java",
"*.native.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -16,10 +16,12 @@ closure_js_library(

# Creates verification target
readable_example(
srcs = glob(["*.java"]),
js_deps = [":externs"],
native_srcs = glob(["*.native.js"]),
srcs = glob([
"*.java",
"*.native.js",
]),
deps = [
":externs",
"//third_party:gwt-jsinterop-annotations-j2cl",
],
)
@@ -9,7 +9,9 @@ load(

# Creates verification target
readable_example(
srcs = glob(["*.java"]),
native_srcs = glob(["*.native.js"]),
srcs = glob([
"*.java",
"*.native.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -9,7 +9,9 @@ load(

# Creates verification target
readable_example(
srcs = glob(["*.java"]),
native_srcs = glob(["*.native.js"]),
srcs = glob([
"*.java",
"*.native.js",
]),
deps = ["//third_party:gwt-jsinterop-annotations-j2cl"],
)
@@ -9,6 +9,8 @@ load(

# Creates verification target
readable_example(
srcs = glob(["*.java"]),
native_srcs = glob(["*.native.js"]),
srcs = glob([
"*.java",
"*.native.js",
]),
)
@@ -21,9 +21,7 @@ JAVAC_FLAGS = [

def readable_example(
srcs,
native_srcs = [],
deps = [],
js_deps = [],
plugins = [],
defs = [],
generate_library_info = False,
@@ -36,9 +34,7 @@ def readable_example(
Args:
srcs: Source files to make readable output for.
native_srcs: Foo.native.js files to merge in.
deps: J2CL libraries referenced by the srcs.
js_deps: JS libraries referenced by the srcs.
plugins: APT processors to execute when generating readable output.
defs: Custom flags to pass to the JavaScript compiler.
generate_library_info: Wheter to copy the call graph for the library in the output dir.
@@ -50,8 +46,7 @@ def readable_example(
name = "readable",
srcs = srcs,
javacopts = JAVAC_FLAGS,
native_srcs = native_srcs,
deps = deps + js_deps,
deps = deps,
plugins = plugins,
generate_build_test = False,
tags = j2cl_library_tags,
@@ -7,7 +7,10 @@ load("//build_defs:rules.bzl", "j2cl_library", "j2cl_test")
j2cl_library(
name = "Java8TestLib",
testonly = 1,
srcs = glob(["**/*.java"]),
srcs = glob([
"**/*.java",
"**/*.js",
]),
javacopts = [
"-Xep:EqualsIncompatibleType:OFF",
"-Xep:SelfComparison:OFF", # See go/self-comparison-lsc
@@ -18,7 +21,6 @@ j2cl_library(
"-Xep:ClassCanBeStatic:OFF",
"-Xep:MethodCanBeStatic:OFF",
],
native_srcs = ["Java8Test.native.js"],
deps = [
"//third_party:gwt-jsinterop-annotations-j2cl",
"//third_party:junit-j2cl",

0 comments on commit ee2a989

Please sign in to comment.
You can’t perform that action at this time.