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

Side by Side Diff: mojo/public/mojo_application.gni

Issue 1512343002: Remove the //mojo/public/c/system:for_shared_library target. (Closed) Base URL: https://github.com/domokit/mojo.git@c_system_target_1
Patch Set: Created 5 years 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
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/module_args/mojo.gni") 5 import("//build/module_args/mojo.gni")
6 import("mojo.gni") 6 import("mojo.gni")
7 import("mojo_sdk.gni") 7 import("mojo_sdk.gni")
8 8
9 # Generate a binary mojo application.The parameters of this template are those 9 # Generate a binary mojo application.The parameters of this template are those
10 # of a shared library. 10 # of a shared library.
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 if (mojo_use_prebuilt_mojo_shell) { 60 if (mojo_use_prebuilt_mojo_shell) {
61 data_deps += 61 data_deps +=
62 [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ] 62 [ rebase_path("mojo/public/tools:copy_mojo_shell", ".", mojo_root) ]
63 } 63 }
64 if (mojo_use_prebuilt_network_service) { 64 if (mojo_use_prebuilt_network_service) {
65 data_deps += [ rebase_path("mojo/public/tools:copy_network_service", 65 data_deps += [ rebase_path("mojo/public/tools:copy_network_service",
66 ".", 66 ".",
67 mojo_root) ] 67 mojo_root) ]
68 } 68 }
69 69
70 deps = rebase_path([ 70 deps =
71 "mojo/public/c/system", 71 rebase_path([ "mojo/public/platform/native:system" ], ".", mojo_root)
viettrungluu 2015/12/10 16:50:06 Building the "binary" doesn't need the headers, on
72 "mojo/public/platform/native:system",
73 ],
74 ".",
75 mojo_root)
76 if (defined(invoker.deps)) { 72 if (defined(invoker.deps)) {
77 deps += invoker.deps 73 deps += invoker.deps
78 } 74 }
79 if (defined(invoker.configs)) { 75 if (defined(invoker.configs)) {
80 configs += invoker.configs 76 configs += invoker.configs
81 } 77 }
82 forward_variables_from(invoker, 78 forward_variables_from(invoker,
83 [ 79 [
84 "public_deps", 80 "public_deps",
85 "all_dependent_configs", 81 "all_dependent_configs",
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 shared_library(shared_library_name) { 299 shared_library(shared_library_name) {
304 visibility = [ 300 visibility = [
305 ":${copy_symbols_target}", 301 ":${copy_symbols_target}",
306 ":${zip_action_name}", 302 ":${zip_action_name}",
307 ] 303 ]
308 304
309 if (defined(invoker.sources)) { 305 if (defined(invoker.sources)) {
310 sources = invoker.sources 306 sources = invoker.sources
311 } 307 }
312 308
313 deps = [] 309 deps =
viettrungluu 2015/12/10 16:50:06 This is building a "binary", so should have this d
310 rebase_path([ "mojo/public/platform/native:system" ], ".", mojo_root)
314 if (defined(invoker.jni_package)) { 311 if (defined(invoker.jni_package)) {
315 deps += [ ":${generate_jni_name}" ] 312 deps += [ ":${generate_jni_name}" ]
316 } 313 }
317 if (defined(invoker.deps)) { 314 if (defined(invoker.deps)) {
318 deps += invoker.deps 315 deps += invoker.deps
319 } 316 }
320 } 317 }
321 318
322 copy(copy_symbols_target) { 319 copy(copy_symbols_target) {
323 visibility = [ ":${final_target_name}" ] 320 visibility = [ ":${final_target_name}" ]
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 deps = [ 423 deps = [
427 ":${copy_symbols_target}", 424 ":${copy_symbols_target}",
428 ] 425 ]
429 426
430 public_deps = [ 427 public_deps = [
431 ":${zip_action_name}", 428 ":${zip_action_name}",
432 ] 429 ]
433 } 430 }
434 } 431 }
435 } 432 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698