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

Unified Diff: skia/BUILD.gn

Issue 589753005: gn: Fix build issues blocking gfx from being built (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: reverted target.cc change Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/BUILD.gn ('k') | third_party/libpng/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: skia/BUILD.gn
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 8cf9fa4d5ab5c6763a99705b1f3f250015155087..6cef18755e0ea9ed7a20a78a993aefa00ea14eda 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -178,6 +178,10 @@ config("skia_library_config") {
"SK_USE_DISCARDABLE_SCALEDIMAGECACHE",
]
+ if (component_mode == "shared_library") {
+ defines += [ "SKIA_IMPLEMENTATION=1" ]
+ }
+
if (cpu_arch == "arm") {
if (arm_use_neon) {
defines += [ "SK_ARM_HAS_NEON" ]
@@ -513,10 +517,6 @@ component("skia") {
"//third_party/zlib",
]
- if (component_mode == "shared_library") {
- defines = [ "SKIA_IMPLEMENTATION=1" ]
- }
-
if (is_win) {
configs -= [
# Some files define WIN32_LEAN_AND_MEAN and we want to avoid a duplicate
@@ -702,6 +702,7 @@ source_set("skia_opts") {
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [
":skia_config",
+ ":skia_library_config",
"//build/config/compiler:no_chromium_code"
]
« no previous file with comments | « chrome/common/BUILD.gn ('k') | third_party/libpng/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698