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

Side by Side Diff: content/shell/BUILD.gn

Issue 595073002: Replace forward_dependent_configs with public_deps (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 | « content/public/utility/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//tools/grit/repack.gni") 7 import("//tools/grit/repack.gni")
8 import("//tools/grit/grit_rule.gni") 8 import("//tools/grit/grit_rule.gni")
9 if (is_android) { 9 if (is_android) {
10 import("//build/config/android/config.gni") 10 import("//build/config/android/config.gni")
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 "grit/shell_resources.h", 336 "grit/shell_resources.h",
337 "shell_resources.pak", 337 "shell_resources.pak",
338 "shell_resources.rc", 338 "shell_resources.rc",
339 ] 339 ]
340 } 340 }
341 341
342 copy("copy_shell_resources") { 342 copy("copy_shell_resources") {
343 sources = [ "$target_gen_dir/shell_resources.pak" ] 343 sources = [ "$target_gen_dir/shell_resources.pak" ]
344 outputs = [ "$root_out_dir/shell_resources.pak" ] 344 outputs = [ "$root_out_dir/shell_resources.pak" ]
345 345
346 deps = [ ":content_shell_resources_grit" ] 346 public_deps = [ ":content_shell_resources_grit" ]
347 forward_dependent_configs_from = [ ":content_shell_resources_grit" ]
348 } 347 }
349 348
350 # Font copies. 349 # Font copies.
351 if (!is_mac) { 350 if (!is_mac) {
352 copy("copy_ahem") { 351 copy("copy_ahem") {
353 visibility = [ ":*" ] 352 visibility = [ ":*" ]
354 sources = [ "renderer/test_runner/resources/fonts/AHEM____.TTF" ] 353 sources = [ "renderer/test_runner/resources/fonts/AHEM____.TTF" ]
355 outputs = [ "$root_out_dir/AHEM____.TTF" ] 354 outputs = [ "$root_out_dir/AHEM____.TTF" ]
356 } 355 }
357 } 356 }
(...skipping 13 matching lines...) Expand all
371 visibility = [ ":*" ] 370 visibility = [ ":*" ]
372 sources = [ 371 sources = [
373 "renderer/test_runner/resources/fonts/android_main_fonts.xml", 372 "renderer/test_runner/resources/fonts/android_main_fonts.xml",
374 "renderer/test_runner/resources/fonts/android_fallback_fonts.xml", 373 "renderer/test_runner/resources/fonts/android_fallback_fonts.xml",
375 ] 374 ]
376 outputs = [ "$root_out_dir/{{source_file_part}}" ] 375 outputs = [ "$root_out_dir/{{source_file_part}}" ]
377 } 376 }
378 } 377 }
379 378
380 group("resources") { 379 group("resources") {
381 deps = [ 380 public_deps = [
382 ":copy_shell_resources", 381 ":copy_shell_resources",
383 ] 382 ]
384 forward_dependent_configs_from = [ ":copy_shell_resources" ] 383 deps = []
385 384
386 if (is_mac) { 385 if (is_mac) {
387 # TODO(GYP) Mac bundle resources. 386 # TODO(GYP) Mac bundle resources.
388 #'all_dependent_settings': { 387 #'all_dependent_settings': {
389 # 'mac_bundle_resources': [ 388 # 'mac_bundle_resources': [
390 # 'shell/renderer/test_runner/resources/fonts/AHEM____.TTF', 389 # 'shell/renderer/test_runner/resources/fonts/AHEM____.TTF',
391 # 'shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf', 390 # 'shell/renderer/test_runner/resources/fonts/ChromiumAATTest.ttf',
392 # '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png', 391 # '<(SHARED_INTERMEDIATE_DIR)/webkit/missingImage.png',
393 # '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png', 392 # '<(SHARED_INTERMEDIATE_DIR)/webkit/textAreaResizeCorner.png',
394 # ], 393 # ],
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
477 if (is_android && !is_android_webview_build) { 476 if (is_android && !is_android_webview_build) {
478 # Some tests rely on this tool. It might be nicer if these tests relied on 477 # Some tests rely on this tool. It might be nicer if these tests relied on
479 # image diff rather than having content shell depend on it. 478 # image diff rather than having content shell depend on it.
480 datadeps = [ 479 datadeps = [
481 "//tools/imagediff($host_toolchain)", 480 "//tools/imagediff($host_toolchain)",
482 ] 481 ]
483 } 482 }
484 } 483 }
485 484
486 } 485 }
OLDNEW
« no previous file with comments | « content/public/utility/BUILD.gn ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698