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

Unified Diff: gyp/common.gypi

Issue 15855006: prepare skia for shared library build on android (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebasing Created 7 years, 7 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 | « gyp/bench.gyp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gyp/common.gypi
diff --git a/gyp/common.gypi b/gyp/common.gypi
index d3e1498efcb11233f0ef3b9ed2cf6f358d30bc8b..2be8bb8142500c71cd10f51b86b2fa663ea3c202 100644
--- a/gyp/common.gypi
+++ b/gyp/common.gypi
@@ -39,6 +39,15 @@
}],
],
},
+ # Validate the 'skia_os' setting against 'skia_shared_lib', because shared
+ # library build is only supported on Android.
+ 'variables': {
+ 'conditions': [
+ [ 'skia_os != "android" and skia_shared_lib', {
+ 'error': '<!(Skia shared lib build only currently supported on Android.)',
+ }],
+ ],
+ },
'includes': [
'common_conditions.gypi',
],
« no previous file with comments | « gyp/bench.gyp ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698