Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Unified Diff: mandoline/app/android/BUILD.gn

Issue 1180653002: Build Mojo apps in subdirectories, like application packages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android build. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mandoline/app/android/BUILD.gn
diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn
index 07edbdc53c51649a7fd3338de0b0311298b92a57..343c540ce453417bb14fabaee79d5d149da80861 100644
--- a/mandoline/app/android/BUILD.gn
+++ b/mandoline/app/android/BUILD.gn
@@ -54,25 +54,21 @@ copy_ex("copy_mandoline_assets") {
deps = [
"//components/devtools_service",
"//components/html_viewer",
- "//components/view_manager",
scottmg 2015/06/12 22:40:10 these are gone on purpose?
msw 2015/06/12 22:57:03 Yeah, the view manager, surfaces, and network serv
- "//components/view_manager/surfaces",
"//mandoline/services/core_services",
"//mojo/runner:bootstrap",
"//mojo/runner:bootstrap_java",
- "//mojo/services/network",
]
sources = [
- "$root_out_dir/core_services.mojo",
- "$root_out_dir/devtools_service.mojo",
"$root_out_dir/lib.stripped/libbootstrap.so",
- "$root_out_dir/network_service.mojo",
"$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
- "$root_out_dir/surfaces_service.mojo",
]
# Directories can't be specified as sources so pass manually to the script.
- args =
- [ "--files=" + rebase_path("$root_out_dir/html_viewer", root_build_dir) ]
+ args = [
+ "--files=" + rebase_path("$root_out_dir/core_services", root_build_dir),
+ "--files=" + rebase_path("$root_out_dir/devtools_service", root_build_dir),
+ "--files=" + rebase_path("$root_out_dir/html_viewer", root_build_dir),
+ ]
if (use_aura) {
deps += [
@@ -80,9 +76,10 @@ copy_ex("copy_mandoline_assets") {
"//mandoline/ui/omnibox",
]
- args +=
- [ "--files=" + rebase_path("$root_out_dir/browser", root_build_dir) ] +
- [ "--files=" + rebase_path("$root_out_dir/omnibox", root_build_dir) ]
+ args += [
+ "--files=" + rebase_path("$root_out_dir/browser", root_build_dir),
+ "--files=" + rebase_path("$root_out_dir/omnibox", root_build_dir),
+ ]
}
}

Powered by Google App Engine
This is Rietveld 408576698