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