Skip to content
Permalink
Browse files

Remove source jar hack since it is no longer necessary.

PiperOrigin-RevId: 237298038
  • Loading branch information...
gkdn authored and Copybara-Service committed Mar 7, 2019
1 parent e857104 commit 01dd2794e0864eccdc3fcad8dc9ee6701fd33665
@@ -34,13 +34,6 @@ alias(
actual = "//transpiler/java/com/google/j2cl/transpiler:BazelJ2clBuilder",
)

# TODO(goktug): remove workaround after b/71772385 is fixed
genrule(
name = "dummy_src",
outs = ["package-info.java"],
cmd = "echo \"package dummy_;\" > $@",
)

# ***************************************************
# Standard library related
# ***************************************************
@@ -132,7 +132,6 @@ def _java_compile(ctx, name, srcs, deps, exports, plugins, exported_plugins, out

return java_common.compile(
ctx,
source_files = ctx.files._srcs_hack,
source_jars = stripped_java_srcs,
deps = deps,
exports = exports,
@@ -227,8 +226,6 @@ J2CL_TOOLCHAIN_ATTRS = {
cfg = "host",
executable = True,
),
# TODO(goktug): remove workaround after b/71772385 is fixed
"_srcs_hack": attr.label(default = Label("//build_defs/internal_do_not_use:dummy_src")),
}
J2CL_TOOLCHAIN_ATTRS.update(J2CL_JS_TOOLCHAIN_ATTRS)

@@ -129,8 +129,10 @@ private Problems transpileImpl() {
CompilationUnitsAndTypeBindings jdtUnitsAndResolvedBindings =
createJdtUnitsAndResolveBindings();
List<CompilationUnit> j2clUnits = convertUnits(jdtUnitsAndResolvedBindings);
checkUnits(j2clUnits);
normalizeUnits(j2clUnits);
if (!j2clUnits.isEmpty()) {
checkUnits(j2clUnits);
normalizeUnits(j2clUnits);
}
generateOutputs(j2clUnits);
return problems;
} catch (Problems.Exit e) {

1 comment on commit 01dd279

@realityforge

This comment has been minimized.

Copy link
Contributor

realityforge commented on 01dd279 Mar 8, 2019

Huzzah!

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