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

Unified Diff: shell/BUILD.gn

Issue 1327033004: Allow building mojo_shell and non-graphical apps/services on a Mac (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: review feedback Created 5 years, 3 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
« no previous file with comments | « services/view_manager/view_manager_service_impl.cc ('k') | shell/application_manager/local_fetcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: shell/BUILD.gn
diff --git a/shell/BUILD.gn b/shell/BUILD.gn
index 56c6596b7a2dcf4a4bd75664c3d6463b1fad1916..a607a848611dc51fac20b63a4cd7a72910d0b126 100644
--- a/shell/BUILD.gn
+++ b/shell/BUILD.gn
@@ -37,8 +37,11 @@ group("tests") {
":mojo_shell_tests",
":shell_nfc_apptests",
"//shell/application_manager:mojo_application_manager_unittests",
- "//shell/crash:crash_unittests",
]
+
+ if (is_android || is_linux) {
+ deps += [ "//shell/crash:crash_unittests" ]
+ }
}
if (is_android) {
@@ -54,10 +57,13 @@ if (!mojo_use_prebuilt_mojo_shell) {
"//build/config/sanitizers:deps",
"//mojo/environment:chromium",
"//mojo/message_pump",
- "//shell/crash",
]
shell_common_data_deps = [ ":mojo_shell_child" ]
+ if (is_android || is_linux) {
+ shell_common_deps += [ "//shell/crash" ]
+ }
+
if (is_android) {
shared_library("mojo_shell") {
sources = [
@@ -201,6 +207,15 @@ source_set("parent_lib") {
"//services/native_viewport:lib",
]
}
+
+ if (is_mac) {
+ sources -= [
+ "url_response_disk_cache_loader.cc",
+ "url_response_disk_cache_loader.h",
+ ]
+
+ deps -= [ "//services/url_response_disk_cache" ]
+ }
}
# This is a separate target mainly since it suppresses check_includes.
@@ -530,6 +545,9 @@ static_library("pingable_app_dummy") {
public_deps = [
"//shell/test:pingable_app($default_toolchain)",
]
+ sources = [
+ "pingable_app_dummy_empty.cc",
+ ]
}
embed_file("embed_pingable") {
« no previous file with comments | « services/view_manager/view_manager_service_impl.cc ('k') | shell/application_manager/local_fetcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698