Chromium Code Reviews| 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 562 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 573 # but rather a response file listing the inputs or sometimes the build will | 573 # but rather a response file listing the inputs or sometimes the build will |
| 574 # be incorrect. In this case, Ninja won't be able to do proper dependency | 574 # be incorrect. In this case, Ninja won't be able to do proper dependency |
| 575 # tracking since if a file is deleted, the command line will be the same | 575 # tracking since if a file is deleted, the command line will be the same |
| 576 # and the action will not be re-run. | 576 # and the action will not be re-run. |
| 577 "--working_directory=" + rebase_path("vector_icons/"), | 577 "--working_directory=" + rebase_path("vector_icons/"), |
| 578 "--output_cc=" + rebase_path(vector_icons_cc_file, root_build_dir), | 578 "--output_cc=" + rebase_path(vector_icons_cc_file, root_build_dir), |
| 579 "--output_h=" + rebase_path(vector_icons_h_file, root_build_dir), | 579 "--output_h=" + rebase_path(vector_icons_h_file, root_build_dir), |
| 580 ] | 580 ] |
| 581 | 581 |
| 582 if (is_mac) { | 582 if (is_mac) { |
| 583 sources += [ "vector_icons/combobox_arrow_mac.icon" ] | 583 sources += [ |
| 584 "vector_icons/combobox_arrow_mac.icon", | |
| 585 "vector_icons/menu_button_arrow_mac.icon", | |
|
tapted
2016/04/21 06:06:45
`git add` this?
Elly Fong-Jones
2016/04/21 15:30:26
Done.
| |
| 586 ] | |
| 584 } | 587 } |
| 585 } | 588 } |
| 586 | 589 |
| 587 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry | 590 # Looking for gfx_geometry? It's //ui/gfx/geometry:geometry |
| 588 | 591 |
| 589 # Depend on this to use native_widget_types.h without pulling in all of gfx. | 592 # Depend on this to use native_widget_types.h without pulling in all of gfx. |
| 590 source_set("native_widget_types") { | 593 source_set("native_widget_types") { |
| 591 public = [ | 594 public = [ |
| 592 "native_widget_types.h", | 595 "native_widget_types.h", |
| 593 ] | 596 ] |
| (...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 856 if (is_android) { | 859 if (is_android) { |
| 857 generate_jni("gfx_jni_headers") { | 860 generate_jni("gfx_jni_headers") { |
| 858 sources = [ | 861 sources = [ |
| 859 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", | 862 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", |
| 860 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", | 863 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", |
| 861 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", | 864 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", |
| 862 ] | 865 ] |
| 863 jni_package = "gfx" | 866 jni_package = "gfx" |
| 864 } | 867 } |
| 865 } | 868 } |
| OLD | NEW |