| 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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 vector_icons_h_file, | 341 vector_icons_h_file, |
| 342 ] | 342 ] |
| 343 deps += [ ":aggregate_vector_icons" ] | 343 deps += [ ":aggregate_vector_icons" ] |
| 344 } | 344 } |
| 345 | 345 |
| 346 # Windows. | 346 # Windows. |
| 347 if (is_win) { | 347 if (is_win) { |
| 348 cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), w
hich is | 348 cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), w
hich is |
| 349 # uninteresting. | 349 # uninteresting. |
| 350 | 350 |
| 351 libs = [ "setupapi.lib" ] | 351 libs = [ |
| 352 "setupapi.lib", |
| 353 "dwrite.lib", |
| 354 ] |
| 352 } else { | 355 } else { |
| 353 sources -= [ | 356 sources -= [ |
| 354 "gdi_util.cc", | 357 "gdi_util.cc", |
| 355 "gdi_util.h", | 358 "gdi_util.h", |
| 356 "icon_util.cc", | 359 "icon_util.cc", |
| 357 "icon_util.h", | 360 "icon_util.h", |
| 358 "sys_color_change_listener.cc", | 361 "sys_color_change_listener.cc", |
| 359 "sys_color_change_listener.h", | 362 "sys_color_change_listener.h", |
| 360 ] | 363 ] |
| 361 } | 364 } |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 ] | 867 ] |
| 865 | 868 |
| 866 ldflags = [ | 869 ldflags = [ |
| 867 "/DELAYLOAD:d2d1.dll", | 870 "/DELAYLOAD:d2d1.dll", |
| 868 "/DELAYLOAD:d3d10_1.dll", | 871 "/DELAYLOAD:d3d10_1.dll", |
| 869 ] | 872 ] |
| 870 | 873 |
| 871 libs = [ | 874 libs = [ |
| 872 "d2d1.lib", | 875 "d2d1.lib", |
| 873 "d3d10_1.lib", | 876 "d3d10_1.lib", |
| 877 "dwrite.lib", |
| 874 "imm32.lib", | 878 "imm32.lib", |
| 875 "oleacc.lib", | 879 "oleacc.lib", |
| 876 ] | 880 ] |
| 877 } | 881 } |
| 878 | 882 |
| 879 if (!is_ios) { | 883 if (!is_ios) { |
| 880 deps += [ | 884 deps += [ |
| 881 "//mojo/edk/system", | 885 "//mojo/edk/system", |
| 882 "//mojo/public/cpp/bindings", | 886 "//mojo/public/cpp/bindings", |
| 883 "//ui/gfx/geometry/mojo:unit_test", | 887 "//ui/gfx/geometry/mojo:unit_test", |
| 884 "//ui/gfx/mojo:test_interfaces", | 888 "//ui/gfx/mojo:test_interfaces", |
| 885 ] | 889 ] |
| 886 } | 890 } |
| 887 } | 891 } |
| 888 | 892 |
| 889 if (is_android) { | 893 if (is_android) { |
| 890 generate_jni("gfx_jni_headers") { | 894 generate_jni("gfx_jni_headers") { |
| 891 sources = [ | 895 sources = [ |
| 892 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", | 896 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", |
| 893 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", | 897 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", |
| 894 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", | 898 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", |
| 895 ] | 899 ] |
| 896 jni_package = "gfx" | 900 jni_package = "gfx" |
| 897 } | 901 } |
| 898 } | 902 } |
| OLD | NEW |