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

Unified Diff: build/common.gypi

Issue 22435002: Android WebView: support building against system skia. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update include to match skia roll Created 7 years, 4 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 | « no previous file | skia/skia.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 158995598c9ae74808cdab1371cf1d90a8731371..6f58dbafbb34d46f190edc9ccd61bc4c5e74d8dd 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1119,6 +1119,9 @@
# Turns on the i18n support in V8.
'v8_enable_i18n_support': 1,
+ # Use the chromium skia by default.
+ 'use_system_skia%': '0',
+
'conditions': [
# The version of GCC in use, set later in platforms that use GCC and have
# not explicitly chosen to build with clang. Currently, this means all
@@ -1332,9 +1335,6 @@
# Uses system APIs for decoding audio and video.
'use_libffmpeg%': '0',
- # Always use the chromium skia.
- 'use_system_skia%': '0',
-
# When building as part of the Android system, use system libraries
# where possible to reduce ROM size.
# TODO(steveblock): Investigate using the system version of sqlite.
« no previous file with comments | « no previous file | skia/skia.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698