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

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

Issue 2111373002: Reland of Link to DirectWrite directly, instead of calling LoadLibrary (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 = [ "setupapi.lib" ] 354 libs = [
355 "setupapi.lib",
356 "dwrite.lib",
357 ]
355 } else { 358 } else {
356 sources -= [ 359 sources -= [
357 "gdi_util.cc", 360 "gdi_util.cc",
358 "gdi_util.h", 361 "gdi_util.h",
359 "icon_util.cc", 362 "icon_util.cc",
360 "icon_util.h", 363 "icon_util.h",
361 "sys_color_change_listener.cc", 364 "sys_color_change_listener.cc",
362 "sys_color_change_listener.h", 365 "sys_color_change_listener.h",
363 ] 366 ]
364 } 367 }
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 ] 891 ]
889 892
890 ldflags = [ 893 ldflags = [
891 "/DELAYLOAD:d2d1.dll", 894 "/DELAYLOAD:d2d1.dll",
892 "/DELAYLOAD:d3d10_1.dll", 895 "/DELAYLOAD:d3d10_1.dll",
893 ] 896 ]
894 897
895 libs = [ 898 libs = [
896 "d2d1.lib", 899 "d2d1.lib",
897 "d3d10_1.lib", 900 "d3d10_1.lib",
901 "dwrite.lib",
898 "imm32.lib", 902 "imm32.lib",
899 "oleacc.lib", 903 "oleacc.lib",
900 ] 904 ]
901 } 905 }
902 906
903 if (!is_ios) { 907 if (!is_ios) {
904 deps += [ 908 deps += [
905 "//mojo/edk/system", 909 "//mojo/edk/system",
906 "//mojo/public/cpp/bindings", 910 "//mojo/public/cpp/bindings",
907 "//ui/gfx/geometry/mojo:unit_test", 911 "//ui/gfx/geometry/mojo:unit_test",
908 "//ui/gfx/mojo:test_interfaces", 912 "//ui/gfx/mojo:test_interfaces",
909 ] 913 ]
910 } 914 }
911 } 915 }
912 916
913 if (is_android) { 917 if (is_android) {
914 generate_jni("gfx_jni_headers") { 918 generate_jni("gfx_jni_headers") {
915 sources = [ 919 sources = [
916 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", 920 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
917 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", 921 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
918 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", 922 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
919 ] 923 ]
920 jni_package = "gfx" 924 jni_package = "gfx"
921 } 925 }
922 } 926 }
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