Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at b62fec7fcb34f152a209dc2184c8f89f4b80b75c

This commit was generated by merge_from_chromium.py.

Change-Id: I966e6e4fcb95060ff33b7df1ca9966b8e1ba9149

6 files changed, 5 insertions, 13 deletions

diff --git a/common_conditions.gypi b/common_conditions.gypi
index 3cf5a63..9f77c7d 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -274,18 +274,10 @@
         # using freetype's embolden allows us to adjust fake bold settings at
         # draw-time, at which point we know which SkTypeface is being drawn
         'SK_USE_FREETYPE_EMBOLDEN',
-        # Android provides at least FreeType 2.4.0 at runtime.
-        'SK_FONTHOST_FREETYPE_RUNTIME_VERSION 0x020400',
-        # Skia should not use dlopen on Android.
-        'SK_CAN_USE_DLOPEN 0',
         'SK_SFNTLY_SUBSETTER "sample/chromium/font_subsetter.h"',
         # When built as part of the system image we can enable certian non-NDK
         # compliant optimizations.
         'SK_BUILD_FOR_ANDROID_FRAMEWORK',
-        # Android Text Tuning
-        'SK_GAMMA_APPLY_TO_A8',
-        'SK_GAMMA_EXPONENT 1.4',
-        'SK_GAMMA_CONTRAST 0.0',
         # Optimizations for chromium (m30)
         'GR_GL_CUSTOM_SETUP_HEADER "gl/GrGLConfig_chrome.h"',
         'IGNORE_ROT_AA_RECT_OPT',
diff --git a/core.gypi b/core.gypi
index 563d1ba..3a8dc21 100644
--- a/core.gypi
+++ b/core.gypi
@@ -115,7 +115,6 @@
         '<(skia_src_path)/core/SkMessageBus.h',
         '<(skia_src_path)/core/SkMetaData.cpp',
         '<(skia_src_path)/core/SkMipMap.cpp',
-        '<(skia_src_path)/core/SkOffsetTable.h',
         '<(skia_src_path)/core/SkPackBits.cpp',
         '<(skia_src_path)/core/SkPaint.cpp',
         '<(skia_src_path)/core/SkPaintOptionsAndroid.cpp',
diff --git a/pathops_unittest.gyp b/pathops_unittest.gyp
index 49af7d7..87e125b 100644
--- a/pathops_unittest.gyp
+++ b/pathops_unittest.gyp
@@ -22,6 +22,8 @@
         'pathops_unittest.gypi',
       ],
       'sources': [
+        '../tests/PathOpsAngleIdeas.cpp',
+        '../tests/PathOpsDebug.cpp',
         '../tests/PathOpsSkpClipTest.cpp',
         '../tests/Test.cpp',
         '../tests/skia_test.cpp',
diff --git a/record.gyp b/record.gyp
index c7f3582..31decb6 100644
--- a/record.gyp
+++ b/record.gyp
@@ -10,8 +10,7 @@
         ],
         'direct_dependent_settings': {
             'include_dirs': [
-                '../include/record',   # World-public headers.
-                '../src/record',       # Skia-public headers.
+                '../include/record',  # Public headers.
             ],
         },
         'sources': [
diff --git a/tests.gypi b/tests.gypi
index 0650065..5c3ce94 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -9,6 +9,7 @@
     '../src/pathops',
     '../src/pdf',
     '../src/pipe/utils',
+    '../src/record',
     '../src/utils',
     '../src/utils/debugger',
     '../tools/',
diff --git a/tools.gyp b/tools.gyp
index 8bcebf5..39a7847 100644
--- a/tools.gyp
+++ b/tools.gyp
@@ -313,12 +313,11 @@
       'type': 'executable',
       'sources': [
         '../tools/bench_playback.cpp',
-        '../tools/LazyDecodeBitmap.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../src/images',
-        '../src/lazy',
+        '../src/record',
       ],
       'dependencies': [
         'flags.gyp:flags',