summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorjam <jam@chromium.org>2016-03-15 09:17:09 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-15 16:18:48 +0000
commit3643404f71aa094be5ab2453d6b01a1ab2c1b97b (patch)
tree00bc7490bce9e0e0429d3f70ae8ac8969a19e570 /mojo
parente3045853929c701a45b7ec8e203f5c1db1d73db6 (diff)
downloadchromium_src-3643404f71aa094be5ab2453d6b01a1ab2c1b97b.zip
chromium_src-3643404f71aa094be5ab2453d6b01a1ab2c1b97b.tar.gz
chromium_src-3643404f71aa094be5ab2453d6b01a1ab2c1b97b.tar.bz2
Switch StoragePartitionService interface to use url::Origin instead of mojo string.
BUG=586194 Review URL: https://codereview.chromium.org/1798113002 Cr-Commit-Position: refs/heads/master@{#381229}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/public/tools/bindings/mojom.gni2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni
index 9ff1af1..fb31385 100644
--- a/mojo/public/tools/bindings/mojom.gni
+++ b/mojo/public/tools/bindings/mojom.gni
@@ -258,7 +258,7 @@ template("mojom") {
}
}
- if (is_android && !defined(invoker.variant)) {
+ if (is_android && !defined(invoker.variant) && !defined(invoker.typemaps)) {
import("//build/config/android/rules.gni")
java_srcjar_target_name = target_name + "_java_sources"