| 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 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 vector_icons_h_file, | 348 vector_icons_h_file, |
| 349 ] | 349 ] |
| 350 deps += [ ":aggregate_vector_icons" ] | 350 deps += [ ":aggregate_vector_icons" ] |
| 351 } | 351 } |
| 352 | 352 |
| 353 # Windows. | 353 # Windows. |
| 354 if (is_win) { | 354 if (is_win) { |
| 355 cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), w
hich is | 355 cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), w
hich is |
| 356 # uninteresting. | 356 # uninteresting. |
| 357 | 357 |
| 358 libs = [ "setupapi.lib" ] | 358 libs = [ |
| 359 "setupapi.lib", |
| 360 "dwrite.lib", |
| 361 ] |
| 359 } else { | 362 } else { |
| 360 sources -= [ | 363 sources -= [ |
| 361 "gdi_util.cc", | 364 "gdi_util.cc", |
| 362 "gdi_util.h", | 365 "gdi_util.h", |
| 363 "icon_util.cc", | 366 "icon_util.cc", |
| 364 "icon_util.h", | 367 "icon_util.h", |
| 365 "sys_color_change_listener.cc", | 368 "sys_color_change_listener.cc", |
| 366 "sys_color_change_listener.h", | 369 "sys_color_change_listener.h", |
| 367 ] | 370 ] |
| 368 } | 371 } |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 702 ] | 705 ] |
| 703 | 706 |
| 704 ldflags = [ | 707 ldflags = [ |
| 705 "/DELAYLOAD:d2d1.dll", | 708 "/DELAYLOAD:d2d1.dll", |
| 706 "/DELAYLOAD:d3d10_1.dll", | 709 "/DELAYLOAD:d3d10_1.dll", |
| 707 ] | 710 ] |
| 708 | 711 |
| 709 libs = [ | 712 libs = [ |
| 710 "d2d1.lib", | 713 "d2d1.lib", |
| 711 "d3d10_1.lib", | 714 "d3d10_1.lib", |
| 715 "dwrite.lib", |
| 712 "imm32.lib", | 716 "imm32.lib", |
| 713 "oleacc.lib", | 717 "oleacc.lib", |
| 714 ] | 718 ] |
| 715 } | 719 } |
| 716 | 720 |
| 717 if (!is_ios) { | 721 if (!is_ios) { |
| 718 deps += [ | 722 deps += [ |
| 719 "//mojo/edk/system", | 723 "//mojo/edk/system", |
| 720 "//mojo/public/cpp/bindings", | 724 "//mojo/public/cpp/bindings", |
| 721 "//ui/gfx/geometry/mojo:unit_test", | 725 "//ui/gfx/geometry/mojo:unit_test", |
| 722 "//ui/gfx/mojo:test_interfaces", | 726 "//ui/gfx/mojo:test_interfaces", |
| 723 ] | 727 ] |
| 724 } | 728 } |
| 725 } | 729 } |
| 726 | 730 |
| 727 if (is_android) { | 731 if (is_android) { |
| 728 generate_jni("gfx_jni_headers") { | 732 generate_jni("gfx_jni_headers") { |
| 729 sources = [ | 733 sources = [ |
| 730 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", | 734 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", |
| 731 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", | 735 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", |
| 732 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", | 736 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", |
| 733 ] | 737 ] |
| 734 jni_package = "gfx" | 738 jni_package = "gfx" |
| 735 } | 739 } |
| 736 } | 740 } |
| OLD | NEW |