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

Side by Side Diff: ui/gfx/BUILD.gn

Issue 2139493002: Move Ash-specific vector icon files into a separate directory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add is_chromeos Created 4 years, 5 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 | ui/gfx/vector_icons/ash/shelf_applist.icon » ('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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//testing/test.gni") 6 import("//testing/test.gni")
7 7
8 if (is_android) { 8 if (is_android) {
9 import("//build/config/android/config.gni") 9 import("//build/config/android/config.gni")
10 import("//build/config/android/rules.gni") 10 import("//build/config/android/rules.gni")
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 if (use_cairo) { 416 if (use_cairo) {
417 configs += [ "//build/config/linux/pangocairo" ] 417 configs += [ "//build/config/linux/pangocairo" ]
418 } 418 }
419 } 419 }
420 420
421 # GYP version: ui/gfx/gfx.gyp:aggregate_vector_icons 421 # GYP version: ui/gfx/gfx.gyp:aggregate_vector_icons
422 action("aggregate_vector_icons") { 422 action("aggregate_vector_icons") {
423 script = "vector_icons/aggregate_vector_icons.py" 423 script = "vector_icons/aggregate_vector_icons.py"
424 424
425 inputs = vector_icons_sources_gypi.common 425 inputs = vector_icons_sources_gypi.common
426 if (use_ash || is_chromeos) {
427 inputs += vector_icons_sources_gypi.ash
428 }
426 429
427 outputs = [ 430 outputs = [
428 vector_icons_cc_file, 431 vector_icons_cc_file,
429 vector_icons_h_file, 432 vector_icons_h_file,
430 ] 433 ]
431 434
432 response_file_contents = rebase_path(inputs, root_build_dir) 435 response_file_contents = rebase_path(inputs, root_build_dir)
433 436
434 args = [ 437 args = [
435 "--working_directory=" + rebase_path("vector_icons/"), 438 "--working_directory=" + rebase_path("vector_icons/"),
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 if (is_component_build) { 496 if (is_component_build) {
494 public_deps = [ 497 public_deps = [
495 ":gfx", 498 ":gfx",
496 ] 499 ]
497 } else { 500 } else {
498 public_deps = [ 501 public_deps = [
499 ":memory_buffer_sources", 502 ":memory_buffer_sources",
500 ] 503 ]
501 } 504 }
502 } 505 }
506
503 # Cannot be a static_library in component builds due to exported functions 507 # Cannot be a static_library in component builds due to exported functions
504 source_set("memory_buffer_sources") { 508 source_set("memory_buffer_sources") {
505 visibility = [ ":*" ] # Depend on through ":memory_buffer". 509 visibility = [ ":*" ] # Depend on through ":memory_buffer".
506 510
507 # TODO(brettw) refactor this so these sources are in a coherent directory 511 # TODO(brettw) refactor this so these sources are in a coherent directory
508 # structure rather than random samplings of ui/gfx and ui/gfx/mac. 512 # structure rather than random samplings of ui/gfx and ui/gfx/mac.
509 sources = [ 513 sources = [
510 "buffer_format_util.cc", 514 "buffer_format_util.cc",
511 "buffer_format_util.h", 515 "buffer_format_util.h",
512 "buffer_types.h", 516 "buffer_types.h",
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
731 if (is_android) { 735 if (is_android) {
732 generate_jni("gfx_jni_headers") { 736 generate_jni("gfx_jni_headers") {
733 sources = [ 737 sources = [
734 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", 738 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
735 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", 739 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
736 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", 740 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
737 ] 741 ]
738 jni_package = "gfx" 742 jni_package = "gfx"
739 } 743 }
740 } 744 }
OLDNEW
« no previous file with comments | « no previous file | ui/gfx/vector_icons/ash/shelf_applist.icon » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698