Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at 8ecee3cd6742fa45e097e49fae4bb55d398b706d
This commit was generated by merge_from_chromium.py.
Change-Id: I5d485302d3acb3288dbbedfbcd742f321a8d7b83
diff --git a/apptype_console.gypi b/apptype_console.gypi
index 85cc502..cde8779 100644
--- a/apptype_console.gypi
+++ b/apptype_console.gypi
@@ -12,7 +12,7 @@
},
},
'conditions': [
- [ 'skia_os == "android"', {
+ [ 'skia_os == "android" and not skia_android_framework', {
'dependencies': [
'android_deps.gyp:Android_EntryPoint',
'android_system.gyp:skia_launcher',
diff --git a/bench.gyp b/bench.gyp
index 43924ab..9e8d1d7 100644
--- a/bench.gyp
+++ b/bench.gyp
@@ -52,11 +52,14 @@
'../bench/BenchSysTimer_windows.h',
'../bench/BenchSysTimer_windows.cpp',
],
- 'include_dirs': [
+ 'include_dirs': [
'../src/core',
'../src/gpu',
'../tools',
],
+ 'direct_dependent_settings': {
+ 'include_dirs': ['../bench'],
+ },
'dependencies': [
'skia_lib.gyp:skia_lib',
],
diff --git a/common_conditions.gypi b/common_conditions.gypi
index ed30245..77dd925 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -307,6 +307,7 @@
'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS',
+ 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
# Needed until we fix skbug.com/2440.
'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
# Transitional, for deprecated SkCanvas::SaveFlags methods.
diff --git a/record.gyp b/record.gyp
index 0bfd83e..5fa7f81 100644
--- a/record.gyp
+++ b/record.gyp
@@ -8,6 +8,7 @@
'../include/config',
'../include/core',
'../include/record',
+ '../src/utils',
],
'direct_dependent_settings': {
'include_dirs': [
diff --git a/skia_for_chromium_defines.gypi b/skia_for_chromium_defines.gypi
index eeac1f6..1ec908e 100644
--- a/skia_for_chromium_defines.gypi
+++ b/skia_for_chromium_defines.gypi
@@ -21,6 +21,7 @@
'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
'SK_SUPPORT_LEGACY_PICTURE_CAN_RECORD',
'SK_SUPPORT_DEPRECATED_RECORD_FLAGS',
+ 'SK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE',
],
},
}
diff --git a/tests.gyp b/tests.gyp
index d0a898c..0d6ed5a 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -15,6 +15,16 @@
'../tests/skia_test.cpp',
],
'conditions': [
+ [ 'skia_android_framework == 1', {
+ 'libraries': [
+ '-lskia',
+ '-lcutils',
+ ],
+ 'libraries!': [
+ '-lz',
+ '-llog',
+ ],
+ }],
[ 'skia_gpu == 1', {
'include_dirs': [
'../src/gpu',
diff --git a/tests.gypi b/tests.gypi
index f27b144..982d58d 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -129,6 +129,7 @@
'../tests/PathUtilsTest.cpp',
'../tests/PictureTest.cpp',
'../tests/PictureShaderTest.cpp',
+ '../tests/PictureStateTreeTest.cpp',
'../tests/PictureUtilsTest.cpp',
'../tests/PixelRefTest.cpp',
'../tests/PointTest.cpp',
diff --git a/tools.gyp b/tools.gyp
index 39a7847..7993b50 100644
--- a/tools.gyp
+++ b/tools.gyp
@@ -18,6 +18,7 @@
'bench_record',
'bench_playback',
'filter',
+ 'gpuveto',
'lua_app',
'lua_pictures',
'pinspect',
@@ -198,7 +199,24 @@
'skia_lib.gyp:skia_lib',
],
},
-
+ {
+ 'target_name': 'gpuveto',
+ 'type': 'executable',
+ 'sources': [
+ '../tools/gpuveto.cpp',
+ '../tools/LazyDecodeBitmap.cpp',
+ ],
+ 'include_dirs': [
+ '../src/core/',
+ '../src/images',
+ '../src/lazy',
+ '../tools/flags',
+ ],
+ 'dependencies': [
+ 'flags.gyp:flags',
+ 'skia_lib.gyp:skia_lib',
+ ],
+ },
{
'target_name': 'lua_app',
'type': 'executable',
@@ -303,6 +321,7 @@
'../src/lazy',
],
'dependencies': [
+ 'bench.gyp:bench_timer',
'flags.gyp:flags',
'skia_lib.gyp:skia_lib',
'record.gyp:*',
@@ -320,6 +339,7 @@
'../src/record',
],
'dependencies': [
+ 'bench.gyp:bench_timer',
'flags.gyp:flags',
'skia_lib.gyp:skia_lib',
'record.gyp:*',
diff --git a/views.gyp b/views.gyp
index b94061a..6db85df 100644
--- a/views.gyp
+++ b/views.gyp
@@ -13,7 +13,6 @@
'standalone_static_library': 1,
'dependencies': [
'skia_lib.gyp:skia_lib',
- 'angle.gyp:*',
'xml.gyp:*',
],
'include_dirs': [
diff --git a/views_animated.gyp b/views_animated.gyp
index 01ec4fa..c10e9f7 100644
--- a/views_animated.gyp
+++ b/views_animated.gyp
@@ -7,7 +7,6 @@
'type': 'static_library',
'dependencies': [
'skia_lib.gyp:skia_lib',
- 'angle.gyp:*',
'animator.gyp:*',
'views.gyp:*',
'xml.gyp:*',
diff --git a/webtry.gyp b/webtry.gyp
index 1f476f3..63f71b9 100644
--- a/webtry.gyp
+++ b/webtry.gyp
@@ -7,6 +7,7 @@
'include_dirs' : [
'../src/core',
'../src/images',
+ '../src/pathops',
],
'sources': [
'../experimental/webtry/result.cpp',
