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

Side by Side Diff: shell/BUILD.gn

Issue 979773002: Revert "Make mojo_shell depend on NSS on Linux." (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/ui.gni") 5 import("//build/config/ui.gni")
6 import("//mojo/public/mojo.gni") 6 import("//mojo/public/mojo.gni")
7 import("//mojo/public/mojo_application.gni") 7 import("//mojo/public/mojo_application.gni")
8 import("//mojo/public/tools/bindings/mojom.gni") 8 import("//mojo/public/tools/bindings/mojom.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 10
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 # It means dynamic symbols must be preserved and exported. 72 # It means dynamic symbols must be preserved and exported.
73 ldflags = [ "-Wl,--export-dynamic" ] 73 ldflags = [ "-Wl,--export-dynamic" ]
74 74
75 deps += [ 75 deps += [
76 ":jni_headers", 76 ":jni_headers",
77 "//services/native_viewport:lib", 77 "//services/native_viewport:lib",
78 "//shell/application_manager", 78 "//shell/application_manager",
79 "//ui/gl", 79 "//ui/gl",
80 ] 80 ]
81 } 81 }
82
83 if (is_linux) {
84 public_configs = [ "//third_party/nss:system_nss_no_ssl_config" ]
85 }
86 } 82 }
87 } # !use_prebuilt_mojo_shell 83 } # !use_prebuilt_mojo_shell
88 84
89 executable("mojo_launcher") { 85 executable("mojo_launcher") {
90 sources = [ 86 sources = [
91 "launcher_main.cc", 87 "launcher_main.cc",
92 ] 88 ]
93 89
94 deps = [ 90 deps = [
95 ":external_application_registrar_bindings", 91 ":external_application_registrar_bindings",
(...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 "//services/http_server/public", 528 "//services/http_server/public",
533 "//services/http_server/public:util", 529 "//services/http_server/public:util",
534 "//shell/test:bindings", 530 "//shell/test:bindings",
535 ] 531 ]
536 532
537 data_deps = [ 533 data_deps = [
538 "//services/http_server:http_server", 534 "//services/http_server:http_server",
539 "//shell/test:pingable_app", 535 "//shell/test:pingable_app",
540 ] 536 ]
541 } 537 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698