Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: ui/gfx/BUILD.gn

Issue 2127313002: Revert of Link to DirectWrite directly, instead of calling LoadLibrary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/gfx/font_fallback_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 vector_icons_h_file, 344 vector_icons_h_file,
345 ] 345 ]
346 deps += [ ":aggregate_vector_icons" ] 346 deps += [ ":aggregate_vector_icons" ]
347 } 347 }
348 348
349 # Windows. 349 # Windows.
350 if (is_win) { 350 if (is_win) {
351 cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), w hich is 351 cflags = [ "/wd4324" ] # Structure was padded due to __declspec(align()), w hich is
352 # uninteresting. 352 # uninteresting.
353 353
354 libs = [ 354 libs = [ "setupapi.lib" ]
355 "setupapi.lib",
356 "dwrite.lib",
357 ]
358 } else { 355 } else {
359 sources -= [ 356 sources -= [
360 "gdi_util.cc", 357 "gdi_util.cc",
361 "gdi_util.h", 358 "gdi_util.h",
362 "icon_util.cc", 359 "icon_util.cc",
363 "icon_util.h", 360 "icon_util.h",
364 "sys_color_change_listener.cc", 361 "sys_color_change_listener.cc",
365 "sys_color_change_listener.h", 362 "sys_color_change_listener.h",
366 ] 363 ]
367 } 364 }
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
891 ] 888 ]
892 889
893 ldflags = [ 890 ldflags = [
894 "/DELAYLOAD:d2d1.dll", 891 "/DELAYLOAD:d2d1.dll",
895 "/DELAYLOAD:d3d10_1.dll", 892 "/DELAYLOAD:d3d10_1.dll",
896 ] 893 ]
897 894
898 libs = [ 895 libs = [
899 "d2d1.lib", 896 "d2d1.lib",
900 "d3d10_1.lib", 897 "d3d10_1.lib",
901 "dwrite.lib",
902 "imm32.lib", 898 "imm32.lib",
903 "oleacc.lib", 899 "oleacc.lib",
904 ] 900 ]
905 } 901 }
906 902
907 if (!is_ios) { 903 if (!is_ios) {
908 deps += [ 904 deps += [
909 "//mojo/edk/system", 905 "//mojo/edk/system",
910 "//mojo/public/cpp/bindings", 906 "//mojo/public/cpp/bindings",
911 "//ui/gfx/geometry/mojo:unit_test", 907 "//ui/gfx/geometry/mojo:unit_test",
912 "//ui/gfx/mojo:test_interfaces", 908 "//ui/gfx/mojo:test_interfaces",
913 ] 909 ]
914 } 910 }
915 } 911 }
916 912
917 if (is_android) { 913 if (is_android) {
918 generate_jni("gfx_jni_headers") { 914 generate_jni("gfx_jni_headers") {
919 sources = [ 915 sources = [
920 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", 916 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
921 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", 917 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
922 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", 918 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
923 ] 919 ]
924 jni_package = "gfx" 920 jni_package = "gfx"
925 } 921 }
926 } 922 }
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/gfx/font_fallback_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698