Update from chromium https://crrev.com/301725/
This updates DEPS to reflect changes in 301725 /
90a7c4e3fdeb82a18e17f24e56345b9086a8308b, imports changes, and adds
a patch file for our ui/gl/gl_surface modifications.
Review URL: https://codereview.chromium.org/669813003
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 2d2668a..16e03a2 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -8,7 +8,7 @@
# However, in the static mode, we need to build skia as multiple targets
# in order to support the use case where a platform (e.g. Android) may
# already have a copy of skia as a system library.
- ['component=="static_library" and use_system_skia==0', {
+ ['component=="static_library"', {
'targets': [
{
'target_name': 'skia_library',
@@ -25,18 +25,6 @@
},
],
}],
- ['component=="static_library" and use_system_skia==1', {
- 'targets': [
- {
- 'target_name': 'skia_library',
- 'type': 'none',
- 'includes': [
- 'skia_system.gypi',
- '../build/android/increase_size_for_speed.gypi',
- ],
- },
- ],
- }],
['component=="static_library"', {
'targets': [
{
