Skip to content

Commit

Permalink
Mojo: Generate Java mojom targets when !cpp_only.
Browse files Browse the repository at this point in the history
Previously, Java mojom targets were generated unless a variant was
specified or typemaps were used. However, Java mojom targets should be
generated for the default variant regardless of whether typemaps are
used. This cl fixes this by switching on the same variable as all the
other decisions for whether to generate Java bindings.

BUG=596202

Review URL: https://codereview.chromium.org/1852163002

Cr-Commit-Position: refs/heads/master@{#385324}
  • Loading branch information
sammc authored and Commit bot committed Apr 5, 2016
1 parent 2b86465 commit 565c598
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion mojo/public/tools/bindings/mojom.gni
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ template("mojom") {
}
}

if (is_android && !defined(invoker.variant) && !defined(invoker.typemaps)) {
if (is_android && !cpp_only) {
import("//build/config/android/rules.gni")

java_srcjar_target_name = target_name + "_java_sources"
Expand Down

0 comments on commit 565c598

Please sign in to comment.