summaryrefslogtreecommitdiffstats
path: root/mandoline
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-06-02 10:38:29 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-02 17:39:11 +0000
commitf883517afb9e390c40043dd67cea6fb0e69b608a (patch)
treef58da09a3caedcc2f30099cb0c93684fddb7db8a /mandoline
parent53cc88da9a258bc4a34c4bff50025ee044c2e64d (diff)
downloadchromium_src-f883517afb9e390c40043dd67cea6fb0e69b608a.zip
chromium_src-f883517afb9e390c40043dd67cea6fb0e69b608a.tar.gz
chromium_src-f883517afb9e390c40043dd67cea6fb0e69b608a.tar.bz2
Fixes for GN Android build inputs/outputs
This makes the inputs and outputs of various Android targets match the dependency tree. There are still 565 errors remaining. Renames datadeps -> data_deps in some places. Review URL: https://codereview.chromium.org/1149893018 Cr-Commit-Position: refs/heads/master@{#332424}
Diffstat (limited to 'mandoline')
-rw-r--r--mandoline/app/android/BUILD.gn1
-rw-r--r--mandoline/services/core_services/BUILD.gn1
2 files changed, 2 insertions, 0 deletions
diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn
index 56dfa62..7c3c34b 100644
--- a/mandoline/app/android/BUILD.gn
+++ b/mandoline/app/android/BUILD.gn
@@ -54,6 +54,7 @@ copy_ex("copy_mandoline_assets") {
"//components/view_manager",
"//components/view_manager/surfaces",
"//mandoline/services/core_services",
+ "//mojo/runner:bootstrap",
"//mojo/runner:bootstrap_java",
"//mojo/services/network",
]
diff --git a/mandoline/services/core_services/BUILD.gn b/mandoline/services/core_services/BUILD.gn
index be926ed..3964619 100644
--- a/mandoline/services/core_services/BUILD.gn
+++ b/mandoline/services/core_services/BUILD.gn
@@ -19,6 +19,7 @@ if (is_android) {
input_dex_jar = java_library_path
deps = [
":java_library",
+ ":native_library",
]
}