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

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: Fix aura_demo build and tweak formatting 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
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 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 = [ "setupapi.lib" ] 353 libs = [
354 "setupapi.lib",
355 "dwrite.lib",
356 ]
354 } else { 357 } else {
355 sources -= [ 358 sources -= [
356 "gdi_util.cc", 359 "gdi_util.cc",
357 "gdi_util.h", 360 "gdi_util.h",
358 "icon_util.cc", 361 "icon_util.cc",
359 "icon_util.h", 362 "icon_util.h",
360 "sys_color_change_listener.cc", 363 "sys_color_change_listener.cc",
361 "sys_color_change_listener.h", 364 "sys_color_change_listener.h",
362 ] 365 ]
363 } 366 }
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
869 ] 872 ]
870 873
871 ldflags = [ 874 ldflags = [
872 "/DELAYLOAD:d2d1.dll", 875 "/DELAYLOAD:d2d1.dll",
873 "/DELAYLOAD:d3d10_1.dll", 876 "/DELAYLOAD:d3d10_1.dll",
874 ] 877 ]
875 878
876 libs = [ 879 libs = [
877 "d2d1.lib", 880 "d2d1.lib",
878 "d3d10_1.lib", 881 "d3d10_1.lib",
882 "dwrite.lib",
879 "imm32.lib", 883 "imm32.lib",
880 "oleacc.lib", 884 "oleacc.lib",
881 ] 885 ]
882 } 886 }
883 887
884 if (!is_ios) { 888 if (!is_ios) {
885 deps += [ 889 deps += [
886 "//mojo/edk/system", 890 "//mojo/edk/system",
887 "//mojo/public/cpp/bindings", 891 "//mojo/public/cpp/bindings",
888 "//ui/gfx/geometry/mojo:unit_test", 892 "//ui/gfx/geometry/mojo:unit_test",
889 "//ui/gfx/mojo:test_interfaces", 893 "//ui/gfx/mojo:test_interfaces",
890 ] 894 ]
891 } 895 }
892 } 896 }
893 897
894 if (is_android) { 898 if (is_android) {
895 generate_jni("gfx_jni_headers") { 899 generate_jni("gfx_jni_headers") {
896 sources = [ 900 sources = [
897 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java", 901 "../android/java/src/org/chromium/ui/gfx/BitmapHelper.java",
898 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java", 902 "../android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java",
899 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java", 903 "../android/java/src/org/chromium/ui/gfx/ViewConfigurationHelper.java",
900 ] 904 ]
901 jni_package = "gfx" 905 jni_package = "gfx"
902 } 906 }
903 } 907 }
OLDNEW
« ui/aura/aura.gyp ('K') | « 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