| OLD | NEW |
| 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 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 args = [ | 569 args = [ |
| 570 # TODO(brettw) bug 535386: This should not take a directory as an input, | 570 # TODO(brettw) bug 535386: This should not take a directory as an input, |
| 571 # but rather a response file listing the inputs or sometimes the build will | 571 # but rather a response file listing the inputs or sometimes the build will |
| 572 # be incorrect. In this case, Ninja won't be able to do proper dependency | 572 # be incorrect. In this case, Ninja won't be able to do proper dependency |
| 573 # tracking since if a file is deleted, the command line will be the same | 573 # tracking since if a file is deleted, the command line will be the same |
| 574 # and the action will not be re-run. | 574 # and the action will not be re-run. |
| 575 "--working_directory=" + rebase_path("vector_icons/"), | 575 "--working_directory=" + rebase_path("vector_icons/"), |
| 576 "--output_cc=" + rebase_path(vector_icons_cc_file, root_build_dir), | 576 "--output_cc=" + rebase_path(vector_icons_cc_file, root_build_dir), |
| 577 "--output_h=" + rebase_path(vector_icons_h_file, root_build_dir), | 577 "--output_h=" + rebase_path(vector_icons_h_file, root_build_dir), |
| 578 ] | 578 ] |
| 579 |
| 580 if (is_mac) { |
| 581 sources += [ "vector_icons/combobox_arrow_mac.icon" ] |
| 582 } |
| 579 } | 583 } |
| 580 | 584 |
| 581 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry | 585 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry |
| 582 | 586 |
| 583 # Depend on this to use native_widget_types.h without pulling in all of gfx. | 587 # Depend on this to use native_widget_types.h without pulling in all of gfx. |
| 584 source_set("native_widget_types") { | 588 source_set("native_widget_types") { |
| 585 public = [ | 589 public = [ |
| 586 "native_widget_types.h", | 590 "native_widget_types.h", |
| 587 ] | 591 ] |
| 588 | 592 |
| (...skipping 261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 850 if (is_android) { | 854 if (is_android) { |
| 851 generate_jni("gfx_jni_headers") { | 855 generate_jni("gfx_jni_headers") { |
| 852 sources = [ | 856 sources = [ |
| 853 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", | 857 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", |
| 854 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", | 858 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", |
| 855 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", | 859 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", |
| 856 ] | 860 ] |
| 857 jni_package = "gfx" | 861 jni_package = "gfx" |
| 858 } | 862 } |
| 859 } | 863 } |
| OLD | NEW |