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

Unified Diff: gyp/common_variables.gypi

Issue 406613003: Introduce skia_pic gyp variable. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« gyp/common_conditions.gypi ('K') | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common_variables.gypi
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index c3714dc6c038757d152daaa085d700464c281397..24f0e879fa50bf90a75764846e8eef85a3c8eb90 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -180,6 +180,13 @@
'skia_clang_build%': 0,
'skia_keep_frame_pointer%': 0,
}],
+ [ 'skia_shared_lib == 1 or skia_sanitizer == "thread" '
+ 'or skia_sanitizer == "undefined" or skia_os == "android"', {
djsollen 2014/07/18 19:02:25 does the sanitizer stuff need to be guarded by...
scroggo 2014/07/18 19:06:43 Good question. I'm guessing we don't ever build th
mtklein 2014/07/19 14:49:19 Right. No need to guard. It won't ever be set on
scroggo 2014/07/22 14:53:36 Done.
+ 'skia_pic%' : 1,
+ }, {
+ 'skia_pic%' : 0,
+ }
+ ],
],
# Re-define all variables defined within the level-2 'variables' dict,
« gyp/common_conditions.gypi ('K') | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698