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

Unified Diff: third_party/mojo/src/mojo/public/tools/BUILD.gn

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 10 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: third_party/mojo/src/mojo/public/tools/BUILD.gn
diff --git a/third_party/mojo/src/mojo/public/tools/BUILD.gn b/third_party/mojo/src/mojo/public/tools/BUILD.gn
index 103c25973a9eb195a6ad5e9c69ae1db8adb34361..e03d1d311696c4b6c5205129bd940286a51137c1 100644
--- a/third_party/mojo/src/mojo/public/tools/BUILD.gn
+++ b/third_party/mojo/src/mojo/public/tools/BUILD.gn
@@ -2,28 +2,64 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/module_args/mojo.gni")
import("../mojo.gni")
if (use_prebuilt_mojo_shell) {
copy("copy_mojo_shell") {
filename = "mojo_shell"
- if (is_win) {
- filename += ".exe"
- }
if (is_android) {
filename = "MojoShell.apk"
- }
- sources = [
- "prebuilt/$filename",
- ]
- if (is_android) {
+ sources = [
+ "prebuilt/shell/android-arm/$filename",
+ ]
outputs = [
"$root_out_dir/apks/$filename",
]
} else {
+ assert(is_linux)
+ sources = [
+ "prebuilt/shell/linux-x64/$filename",
+ ]
outputs = [
"$root_out_dir/$filename",
]
}
}
}
+
+if (use_prebuilt_network_service) {
+ copy("copy_network_service") {
+ filename = "network_service.mojo"
+ if (is_android) {
+ sources = [
+ "prebuilt/network_service/android-arm/$filename",
+ ]
+ } else {
+ assert(is_linux)
+ sources = [
+ "prebuilt/network_service/linux-x64/$filename",
+ ]
+ }
+ outputs = [
+ "$root_out_dir/$filename",
+ ]
+ }
+
+ copy("copy_network_service_apptests") {
+ filename = "network_service_apptests.mojo"
+ if (is_android) {
+ sources = [
+ "prebuilt/network_service_apptests/android-arm/$filename",
+ ]
+ } else {
+ assert(is_linux)
+ sources = [
+ "prebuilt/network_service_apptests/linux-x64/$filename",
+ ]
+ }
+ outputs = [
+ "$root_out_dir/$filename",
+ ]
+ }
+}
« no previous file with comments | « third_party/mojo/src/mojo/public/python/rules.gni ('k') | third_party/mojo/src/mojo/public/tools/NETWORK_SERVICE_VERSION » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698