Revert "Use system skia for WebView."
This CL was causing some build failures in klp-modular-dev and
klp-volantis-dev. Reverting while we investigate.
This reverts commit 63baaa137ed8bfe0b24385a0e1c944cd3dd811bd.
Change-Id: Ib3c84431ee294efbb243387afde820ca33082186
diff --git a/GypAndroid.darwin-arm.mk b/GypAndroid.darwin-arm.mk
index fa0b8ea..3bd3b18 100644
--- a/GypAndroid.darwin-arm.mk
+++ b/GypAndroid.darwin-arm.mk
@@ -103,6 +103,8 @@
include $(LOCAL_PATH)/skia/skia_chrome.target.darwin-arm.mk
include $(LOCAL_PATH)/skia/skia_chrome_opts.target.darwin-arm.mk
include $(LOCAL_PATH)/skia/skia_library.target.darwin-arm.mk
+include $(LOCAL_PATH)/skia/skia_opts.target.darwin-arm.mk
+include $(LOCAL_PATH)/skia/skia_opts_neon.target.darwin-arm.mk
include $(LOCAL_PATH)/sql/sql.target.darwin-arm.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-arm.mk
@@ -158,10 +160,12 @@
include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_generate_devtools_grd.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/angle/src/translator.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/expat/expat.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/freetype/ft2.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/icu/icudata.host.darwin-arm.mk
@@ -200,6 +204,7 @@
include $(LOCAL_PATH)/third_party/protobuf/protoc.host.darwin-arm.mk
include $(LOCAL_PATH)/third_party/qcms/qcms.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/re2/re2.target.darwin-arm.mk
+include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.darwin-arm.mk
include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.darwin-arm.mk
diff --git a/GypAndroid.darwin-mips.mk b/GypAndroid.darwin-mips.mk
index 7a47bb8..c5991a3 100644
--- a/GypAndroid.darwin-mips.mk
+++ b/GypAndroid.darwin-mips.mk
@@ -100,6 +100,7 @@
include $(LOCAL_PATH)/skia/skia_chrome.target.darwin-mips.mk
include $(LOCAL_PATH)/skia/skia_chrome_opts.target.darwin-mips.mk
include $(LOCAL_PATH)/skia/skia_library.target.darwin-mips.mk
+include $(LOCAL_PATH)/skia/skia_opts.target.darwin-mips.mk
include $(LOCAL_PATH)/sql/sql.target.darwin-mips.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-mips.mk
@@ -154,10 +155,12 @@
include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_generate_devtools_grd.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/angle/src/translator.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/expat/expat.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/freetype/ft2.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/icu/icudata.host.darwin-mips.mk
@@ -196,6 +199,7 @@
include $(LOCAL_PATH)/third_party/protobuf/protoc.host.darwin-mips.mk
include $(LOCAL_PATH)/third_party/qcms/qcms.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/re2/re2.target.darwin-mips.mk
+include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.darwin-mips.mk
include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.darwin-mips.mk
diff --git a/GypAndroid.darwin-x86.mk b/GypAndroid.darwin-x86.mk
index 4f2d8bb..bd69751 100644
--- a/GypAndroid.darwin-x86.mk
+++ b/GypAndroid.darwin-x86.mk
@@ -108,6 +108,8 @@
include $(LOCAL_PATH)/skia/skia_chrome.target.darwin-x86.mk
include $(LOCAL_PATH)/skia/skia_chrome_opts.target.darwin-x86.mk
include $(LOCAL_PATH)/skia/skia_library.target.darwin-x86.mk
+include $(LOCAL_PATH)/skia/skia_opts.target.darwin-x86.mk
+include $(LOCAL_PATH)/skia/skia_opts_ssse3.target.darwin-x86.mk
include $(LOCAL_PATH)/sql/sql.target.darwin-x86.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.darwin-x86.mk
@@ -162,10 +164,12 @@
include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_generate_devtools_grd.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/translator.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/expat/expat.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/freetype/ft2.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/icu/icudata.host.darwin-x86.mk
@@ -204,6 +208,7 @@
include $(LOCAL_PATH)/third_party/protobuf/protoc.host.darwin-x86.mk
include $(LOCAL_PATH)/third_party/qcms/qcms.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/re2/re2.target.darwin-x86.mk
+include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.darwin-x86.mk
include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.darwin-x86.mk
diff --git a/GypAndroid.linux-arm.mk b/GypAndroid.linux-arm.mk
index 07b55b1..90413c8 100644
--- a/GypAndroid.linux-arm.mk
+++ b/GypAndroid.linux-arm.mk
@@ -103,6 +103,8 @@
include $(LOCAL_PATH)/skia/skia_chrome.target.linux-arm.mk
include $(LOCAL_PATH)/skia/skia_chrome_opts.target.linux-arm.mk
include $(LOCAL_PATH)/skia/skia_library.target.linux-arm.mk
+include $(LOCAL_PATH)/skia/skia_opts.target.linux-arm.mk
+include $(LOCAL_PATH)/skia/skia_opts_neon.target.linux-arm.mk
include $(LOCAL_PATH)/sql/sql.target.linux-arm.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-arm.mk
@@ -158,10 +160,12 @@
include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_generate_devtools_grd.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/angle/src/translator.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/expat/expat.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/freetype/ft2.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/icu/icudata.host.linux-arm.mk
@@ -200,6 +204,7 @@
include $(LOCAL_PATH)/third_party/protobuf/protoc.host.linux-arm.mk
include $(LOCAL_PATH)/third_party/qcms/qcms.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/re2/re2.target.linux-arm.mk
+include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.linux-arm.mk
include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.linux-arm.mk
diff --git a/GypAndroid.linux-mips.mk b/GypAndroid.linux-mips.mk
index 4c24a1f..e3699d2 100644
--- a/GypAndroid.linux-mips.mk
+++ b/GypAndroid.linux-mips.mk
@@ -100,6 +100,7 @@
include $(LOCAL_PATH)/skia/skia_chrome.target.linux-mips.mk
include $(LOCAL_PATH)/skia/skia_chrome_opts.target.linux-mips.mk
include $(LOCAL_PATH)/skia/skia_library.target.linux-mips.mk
+include $(LOCAL_PATH)/skia/skia_opts.target.linux-mips.mk
include $(LOCAL_PATH)/sql/sql.target.linux-mips.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-mips.mk
@@ -154,10 +155,12 @@
include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_generate_devtools_grd.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.linux-mips.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/angle/src/translator.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/expat/expat.target.linux-mips.mk
+include $(LOCAL_PATH)/third_party/freetype/ft2.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/icu/icudata.host.linux-mips.mk
@@ -196,6 +199,7 @@
include $(LOCAL_PATH)/third_party/protobuf/protoc.host.linux-mips.mk
include $(LOCAL_PATH)/third_party/qcms/qcms.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/re2/re2.target.linux-mips.mk
+include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.linux-mips.mk
include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.linux-mips.mk
diff --git a/GypAndroid.linux-x86.mk b/GypAndroid.linux-x86.mk
index 9653efe..5335266 100644
--- a/GypAndroid.linux-x86.mk
+++ b/GypAndroid.linux-x86.mk
@@ -108,6 +108,8 @@
include $(LOCAL_PATH)/skia/skia_chrome.target.linux-x86.mk
include $(LOCAL_PATH)/skia/skia_chrome_opts.target.linux-x86.mk
include $(LOCAL_PATH)/skia/skia_library.target.linux-x86.mk
+include $(LOCAL_PATH)/skia/skia_opts.target.linux-x86.mk
+include $(LOCAL_PATH)/skia/skia_opts_ssse3.target.linux-x86.mk
include $(LOCAL_PATH)/sql/sql.target.linux-x86.mk
include $(LOCAL_PATH)/testing/gtest_prod.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/Source/bindings/bindings_derived_sources.target.linux-x86.mk
@@ -162,10 +164,12 @@
include $(LOCAL_PATH)/third_party/WebKit/public/blink.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_generate_devtools_grd.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/WebKit/public/blink_minimal.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/WebKit/public/blink_skia_config.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/preprocessor.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/angle/src/translator.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/ashmem/ashmem.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/expat/expat.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/freetype/ft2.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/harfbuzz-ng/harfbuzz-ng.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/iccjpeg/iccjpeg.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/icu/icudata.host.linux-x86.mk
@@ -204,6 +208,7 @@
include $(LOCAL_PATH)/third_party/protobuf/protoc.host.linux-x86.mk
include $(LOCAL_PATH)/third_party/qcms/qcms.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/re2/re2.target.linux-x86.mk
+include $(LOCAL_PATH)/third_party/sfntly/sfntly.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/smhasher/cityhash.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/sqlite/sqlite.target.linux-x86.mk
include $(LOCAL_PATH)/third_party/widevine/cdm/widevine_cdm_version_h.target.linux-x86.mk
diff --git a/android_webview/android_webview_common.target.darwin-arm.mk b/android_webview/android_webview_common.target.darwin-arm.mk
index f564d39..e5d0958 100644
--- a/android_webview/android_webview_common.target.darwin-arm.mk
+++ b/android_webview/android_webview_common.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp)/android_webview_pak.stamp
@@ -128,7 +129,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -149,7 +160,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -159,9 +169,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -246,7 +263,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -268,7 +295,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -278,9 +304,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -360,13 +393,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/android_webview_common.target.darwin-mips.mk b/android_webview/android_webview_common.target.darwin-mips.mk
index 6dc39f1..1fed266 100644
--- a/android_webview/android_webview_common.target.darwin-mips.mk
+++ b/android_webview/android_webview_common.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp)/android_webview_pak.stamp
@@ -127,7 +128,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -148,7 +159,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -158,9 +168,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -244,7 +261,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -266,7 +293,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -276,9 +302,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -354,13 +387,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/android_webview_common.target.darwin-x86.mk b/android_webview/android_webview_common.target.darwin-x86.mk
index 128af68..2ee16f7 100644
--- a/android_webview/android_webview_common.target.darwin-x86.mk
+++ b/android_webview/android_webview_common.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp)/android_webview_pak.stamp
@@ -130,7 +131,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -151,7 +162,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -161,9 +171,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -251,7 +268,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -273,7 +300,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -283,9 +309,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -360,13 +393,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/android_webview_common.target.linux-arm.mk b/android_webview/android_webview_common.target.linux-arm.mk
index f564d39..e5d0958 100644
--- a/android_webview/android_webview_common.target.linux-arm.mk
+++ b/android_webview/android_webview_common.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp)/android_webview_pak.stamp
@@ -128,7 +129,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -149,7 +160,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -159,9 +169,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -246,7 +263,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -268,7 +295,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -278,9 +304,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -360,13 +393,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/android_webview_common.target.linux-mips.mk b/android_webview/android_webview_common.target.linux-mips.mk
index 6dc39f1..1fed266 100644
--- a/android_webview/android_webview_common.target.linux-mips.mk
+++ b/android_webview/android_webview_common.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp)/android_webview_pak.stamp
@@ -127,7 +128,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -148,7 +159,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -158,9 +168,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -244,7 +261,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -266,7 +293,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -276,9 +302,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -354,13 +387,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/android_webview_common.target.linux-x86.mk b/android_webview/android_webview_common.target.linux-x86.mk
index 128af68..2ee16f7 100644
--- a/android_webview/android_webview_common.target.linux-x86.mk
+++ b/android_webview/android_webview_common.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_android_webview_pak_gyp)/android_webview_pak.stamp
@@ -130,7 +131,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -151,7 +162,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -161,9 +171,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -251,7 +268,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -273,7 +300,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -283,9 +309,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -360,13 +393,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/libwebviewchromium.target.darwin-arm.mk b/android_webview/libwebviewchromium.target.darwin-arm.mk
index 526cb7e..6e0f242 100644
--- a/android_webview/libwebviewchromium.target.darwin-arm.mk
+++ b/android_webview/libwebviewchromium.target.darwin-arm.mk
@@ -39,10 +39,16 @@
$(call intermediates-dir-for,GYP,net_net_resources_gyp)/net_resources.stamp \
$(call intermediates-dir-for,GYP,net_net_jni_headers_gyp)/net_jni_headers.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_gyp)/skia_skia_opts_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_neon_gyp)/skia_skia_opts_neon_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_sfntly_sfntly_gyp)/third_party_sfntly_sfntly_gyp.a \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_freetype_ft2_gyp)/third_party_freetype_ft2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_opts_gyp)/skia_skia_chrome_opts_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_jni_headers_gyp)/gfx_jni_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_view_jni_headers_gyp)/gfx_view_jni_headers.stamp \
@@ -210,7 +216,6 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,sandbox_seccomp_bpf_helpers_gyp)/sandbox_seccomp_bpf_helpers_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,components_webdata_common_gyp)/components_webdata_common_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_gyp)/third_party_libjingle_libjingle_gyp.a \
- $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_p2p_constants_gyp)/third_party_libjingle_libjingle_p2p_constants_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_gyp)/third_party_libphonenumber_libphonenumber_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -311,7 +316,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -402,7 +406,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -438,6 +441,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-Wl,-z,relro \
-Wl,-z,now \
-fuse-ld=gold \
@@ -446,7 +450,6 @@
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,-shared,-Bsymbolic \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -458,6 +461,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-Wl,-z,relro \
-Wl,-z,now \
-fuse-ld=gold \
@@ -469,7 +473,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel
@@ -496,9 +499,14 @@
sdch_sdch_gyp \
third_party_zlib_zlib_gyp \
url_url_lib_gyp \
+ skia_skia_library_gyp \
+ skia_skia_opts_gyp \
+ skia_skia_opts_neon_gyp \
+ third_party_sfntly_sfntly_gyp \
+ third_party_freetype_ft2_gyp \
+ third_party_libpng_libpng_gyp \
skia_skia_chrome_gyp \
skia_skia_chrome_opts_gyp \
- third_party_libpng_libpng_gyp \
ui_ui_gyp \
ui_events_events_base_gyp \
ui_events_dom4_keycode_converter_gyp \
@@ -619,9 +627,8 @@
libjnigraphics \
libicui18n \
libicuuc \
- libskia \
- libjpeg \
libexpat \
+ libjpeg \
libstlport \
libdl
diff --git a/android_webview/libwebviewchromium.target.darwin-mips.mk b/android_webview/libwebviewchromium.target.darwin-mips.mk
index 6125226..6a6b13f 100644
--- a/android_webview/libwebviewchromium.target.darwin-mips.mk
+++ b/android_webview/libwebviewchromium.target.darwin-mips.mk
@@ -39,10 +39,15 @@
$(call intermediates-dir-for,GYP,net_net_resources_gyp)/net_resources.stamp \
$(call intermediates-dir-for,GYP,net_net_jni_headers_gyp)/net_jni_headers.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_gyp)/skia_skia_opts_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_sfntly_sfntly_gyp)/third_party_sfntly_sfntly_gyp.a \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_freetype_ft2_gyp)/third_party_freetype_ft2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_opts_gyp)/skia_skia_chrome_opts_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_jni_headers_gyp)/gfx_jni_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_view_jni_headers_gyp)/gfx_view_jni_headers.stamp \
@@ -206,7 +211,6 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,sandbox_sandbox_services_gyp)/sandbox_sandbox_services_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,components_webdata_common_gyp)/components_webdata_common_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_gyp)/third_party_libjingle_libjingle_gyp.a \
- $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_p2p_constants_gyp)/third_party_libjingle_libjingle_p2p_constants_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_gyp)/third_party_libphonenumber_libphonenumber_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -306,7 +310,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -396,7 +399,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -432,13 +434,13 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-EL \
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,-shared,-Bsymbolic \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -450,6 +452,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-EL \
-Wl,--no-keep-memory \
-nostdlib \
@@ -459,7 +462,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel
@@ -486,9 +488,13 @@
sdch_sdch_gyp \
third_party_zlib_zlib_gyp \
url_url_lib_gyp \
+ skia_skia_library_gyp \
+ skia_skia_opts_gyp \
+ third_party_sfntly_sfntly_gyp \
+ third_party_freetype_ft2_gyp \
+ third_party_libpng_libpng_gyp \
skia_skia_chrome_gyp \
skia_skia_chrome_opts_gyp \
- third_party_libpng_libpng_gyp \
ui_ui_gyp \
ui_events_events_base_gyp \
ui_events_dom4_keycode_converter_gyp \
@@ -605,9 +611,8 @@
libjnigraphics \
libicui18n \
libicuuc \
- libskia \
- libjpeg \
libexpat \
+ libjpeg \
libstlport \
libdl
diff --git a/android_webview/libwebviewchromium.target.darwin-x86.mk b/android_webview/libwebviewchromium.target.darwin-x86.mk
index 5084f3b..59cae38 100644
--- a/android_webview/libwebviewchromium.target.darwin-x86.mk
+++ b/android_webview/libwebviewchromium.target.darwin-x86.mk
@@ -39,10 +39,16 @@
$(call intermediates-dir-for,GYP,net_net_resources_gyp)/net_resources.stamp \
$(call intermediates-dir-for,GYP,net_net_jni_headers_gyp)/net_jni_headers.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_gyp)/skia_skia_opts_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_ssse3_gyp)/skia_skia_opts_ssse3_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_sfntly_sfntly_gyp)/third_party_sfntly_sfntly_gyp.a \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_freetype_ft2_gyp)/third_party_freetype_ft2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_opts_gyp)/skia_skia_chrome_opts_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_jni_headers_gyp)/gfx_jni_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_view_jni_headers_gyp)/gfx_view_jni_headers.stamp \
@@ -214,7 +220,6 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,sandbox_seccomp_bpf_helpers_gyp)/sandbox_seccomp_bpf_helpers_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,components_webdata_common_gyp)/components_webdata_common_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_gyp)/third_party_libjingle_libjingle_gyp.a \
- $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_p2p_constants_gyp)/third_party_libjingle_libjingle_p2p_constants_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_gyp)/third_party_libphonenumber_libphonenumber_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -317,7 +322,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -411,7 +415,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -446,13 +449,13 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-m32 \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,-shared,-Bsymbolic \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -464,6 +467,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-m32 \
-fuse-ld=gold \
-nostdlib \
@@ -473,7 +477,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel
@@ -500,9 +503,14 @@
sdch_sdch_gyp \
third_party_zlib_zlib_gyp \
url_url_lib_gyp \
+ skia_skia_library_gyp \
+ skia_skia_opts_gyp \
+ skia_skia_opts_ssse3_gyp \
+ third_party_sfntly_sfntly_gyp \
+ third_party_freetype_ft2_gyp \
+ third_party_libpng_libpng_gyp \
skia_skia_chrome_gyp \
skia_skia_chrome_opts_gyp \
- third_party_libpng_libpng_gyp \
ui_ui_gyp \
ui_events_events_base_gyp \
ui_events_dom4_keycode_converter_gyp \
@@ -626,9 +634,8 @@
libjnigraphics \
libicui18n \
libicuuc \
- libskia \
- libjpeg \
libexpat \
+ libjpeg \
libstlport \
libdl
diff --git a/android_webview/libwebviewchromium.target.linux-arm.mk b/android_webview/libwebviewchromium.target.linux-arm.mk
index 526cb7e..6e0f242 100644
--- a/android_webview/libwebviewchromium.target.linux-arm.mk
+++ b/android_webview/libwebviewchromium.target.linux-arm.mk
@@ -39,10 +39,16 @@
$(call intermediates-dir-for,GYP,net_net_resources_gyp)/net_resources.stamp \
$(call intermediates-dir-for,GYP,net_net_jni_headers_gyp)/net_jni_headers.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_gyp)/skia_skia_opts_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_neon_gyp)/skia_skia_opts_neon_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_sfntly_sfntly_gyp)/third_party_sfntly_sfntly_gyp.a \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_freetype_ft2_gyp)/third_party_freetype_ft2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_opts_gyp)/skia_skia_chrome_opts_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_jni_headers_gyp)/gfx_jni_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_view_jni_headers_gyp)/gfx_view_jni_headers.stamp \
@@ -210,7 +216,6 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,sandbox_seccomp_bpf_helpers_gyp)/sandbox_seccomp_bpf_helpers_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,components_webdata_common_gyp)/components_webdata_common_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_gyp)/third_party_libjingle_libjingle_gyp.a \
- $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_p2p_constants_gyp)/third_party_libjingle_libjingle_p2p_constants_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_gyp)/third_party_libphonenumber_libphonenumber_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -311,7 +316,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -402,7 +406,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -438,6 +441,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-Wl,-z,relro \
-Wl,-z,now \
-fuse-ld=gold \
@@ -446,7 +450,6 @@
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,-shared,-Bsymbolic \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -458,6 +461,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-Wl,-z,relro \
-Wl,-z,now \
-fuse-ld=gold \
@@ -469,7 +473,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel
@@ -496,9 +499,14 @@
sdch_sdch_gyp \
third_party_zlib_zlib_gyp \
url_url_lib_gyp \
+ skia_skia_library_gyp \
+ skia_skia_opts_gyp \
+ skia_skia_opts_neon_gyp \
+ third_party_sfntly_sfntly_gyp \
+ third_party_freetype_ft2_gyp \
+ third_party_libpng_libpng_gyp \
skia_skia_chrome_gyp \
skia_skia_chrome_opts_gyp \
- third_party_libpng_libpng_gyp \
ui_ui_gyp \
ui_events_events_base_gyp \
ui_events_dom4_keycode_converter_gyp \
@@ -619,9 +627,8 @@
libjnigraphics \
libicui18n \
libicuuc \
- libskia \
- libjpeg \
libexpat \
+ libjpeg \
libstlport \
libdl
diff --git a/android_webview/libwebviewchromium.target.linux-mips.mk b/android_webview/libwebviewchromium.target.linux-mips.mk
index 6125226..6a6b13f 100644
--- a/android_webview/libwebviewchromium.target.linux-mips.mk
+++ b/android_webview/libwebviewchromium.target.linux-mips.mk
@@ -39,10 +39,15 @@
$(call intermediates-dir-for,GYP,net_net_resources_gyp)/net_resources.stamp \
$(call intermediates-dir-for,GYP,net_net_jni_headers_gyp)/net_jni_headers.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_gyp)/skia_skia_opts_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_sfntly_sfntly_gyp)/third_party_sfntly_sfntly_gyp.a \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_freetype_ft2_gyp)/third_party_freetype_ft2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_opts_gyp)/skia_skia_chrome_opts_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_jni_headers_gyp)/gfx_jni_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_view_jni_headers_gyp)/gfx_view_jni_headers.stamp \
@@ -206,7 +211,6 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,sandbox_sandbox_services_gyp)/sandbox_sandbox_services_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,components_webdata_common_gyp)/components_webdata_common_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_gyp)/third_party_libjingle_libjingle_gyp.a \
- $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_p2p_constants_gyp)/third_party_libjingle_libjingle_p2p_constants_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_gyp)/third_party_libphonenumber_libphonenumber_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -306,7 +310,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -396,7 +399,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -432,13 +434,13 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-EL \
-Wl,--no-keep-memory \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,-shared,-Bsymbolic \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -450,6 +452,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-EL \
-Wl,--no-keep-memory \
-nostdlib \
@@ -459,7 +462,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel
@@ -486,9 +488,13 @@
sdch_sdch_gyp \
third_party_zlib_zlib_gyp \
url_url_lib_gyp \
+ skia_skia_library_gyp \
+ skia_skia_opts_gyp \
+ third_party_sfntly_sfntly_gyp \
+ third_party_freetype_ft2_gyp \
+ third_party_libpng_libpng_gyp \
skia_skia_chrome_gyp \
skia_skia_chrome_opts_gyp \
- third_party_libpng_libpng_gyp \
ui_ui_gyp \
ui_events_events_base_gyp \
ui_events_dom4_keycode_converter_gyp \
@@ -605,9 +611,8 @@
libjnigraphics \
libicui18n \
libicuuc \
- libskia \
- libjpeg \
libexpat \
+ libjpeg \
libstlport \
libdl
diff --git a/android_webview/libwebviewchromium.target.linux-x86.mk b/android_webview/libwebviewchromium.target.linux-x86.mk
index 5084f3b..59cae38 100644
--- a/android_webview/libwebviewchromium.target.linux-x86.mk
+++ b/android_webview/libwebviewchromium.target.linux-x86.mk
@@ -39,10 +39,16 @@
$(call intermediates-dir-for,GYP,net_net_resources_gyp)/net_resources.stamp \
$(call intermediates-dir-for,GYP,net_net_jni_headers_gyp)/net_jni_headers.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_gyp)/skia_skia_opts_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_opts_ssse3_gyp)/skia_skia_opts_ssse3_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_sfntly_sfntly_gyp)/third_party_sfntly_sfntly_gyp.a \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_freetype_ft2_gyp)/third_party_freetype_ft2_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_opts_gyp)/skia_skia_chrome_opts_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libpng_libpng_gyp)/third_party_libpng_libpng_gyp.a \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_jni_headers_gyp)/gfx_jni_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gfx_gfx_view_jni_headers_gyp)/gfx_view_jni_headers.stamp \
@@ -214,7 +220,6 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,sandbox_seccomp_bpf_helpers_gyp)/sandbox_seccomp_bpf_helpers_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,components_webdata_common_gyp)/components_webdata_common_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_gyp)/third_party_libjingle_libjingle_gyp.a \
- $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libjingle_libjingle_p2p_constants_gyp)/third_party_libjingle_libjingle_p2p_constants_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_gyp)/third_party_libphonenumber_libphonenumber_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -317,7 +322,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -411,7 +415,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -446,13 +449,13 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-m32 \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,-shared,-Bsymbolic \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -464,6 +467,7 @@
-Wl,-z,relro \
-Wl,-z,noexecstack \
-fPIC \
+ -Wl,--no-fatal-warnings \
-m32 \
-fuse-ld=gold \
-nostdlib \
@@ -473,7 +477,6 @@
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel
@@ -500,9 +503,14 @@
sdch_sdch_gyp \
third_party_zlib_zlib_gyp \
url_url_lib_gyp \
+ skia_skia_library_gyp \
+ skia_skia_opts_gyp \
+ skia_skia_opts_ssse3_gyp \
+ third_party_sfntly_sfntly_gyp \
+ third_party_freetype_ft2_gyp \
+ third_party_libpng_libpng_gyp \
skia_skia_chrome_gyp \
skia_skia_chrome_opts_gyp \
- third_party_libpng_libpng_gyp \
ui_ui_gyp \
ui_events_events_base_gyp \
ui_events_dom4_keycode_converter_gyp \
@@ -626,9 +634,8 @@
libjnigraphics \
libicui18n \
libicuuc \
- libskia \
- libjpeg \
libexpat \
+ libjpeg \
libstlport \
libdl
diff --git a/android_webview/native/webview_native.target.darwin-arm.mk b/android_webview/native/webview_native.target.darwin-arm.mk
index c748966..fad54be 100644
--- a/android_webview/native/webview_native.target.darwin-arm.mk
+++ b/android_webview/native/webview_native.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_native_android_webview_native_jni_gyp)/android_webview_native_jni.stamp
@@ -104,7 +105,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -121,7 +132,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -131,9 +141,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -205,7 +222,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -223,7 +250,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -233,9 +259,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -302,13 +335,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/native/webview_native.target.darwin-mips.mk b/android_webview/native/webview_native.target.darwin-mips.mk
index 5d8e36f..84275a8 100644
--- a/android_webview/native/webview_native.target.darwin-mips.mk
+++ b/android_webview/native/webview_native.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_native_android_webview_native_jni_gyp)/android_webview_native_jni.stamp
@@ -103,7 +104,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -120,7 +131,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -130,9 +140,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -203,7 +220,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,7 +248,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -231,9 +257,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -296,13 +329,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/native/webview_native.target.darwin-x86.mk b/android_webview/native/webview_native.target.darwin-x86.mk
index 012fd72..81d6708 100644
--- a/android_webview/native/webview_native.target.darwin-x86.mk
+++ b/android_webview/native/webview_native.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_native_android_webview_native_jni_gyp)/android_webview_native_jni.stamp
@@ -105,7 +106,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -122,7 +133,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -132,9 +142,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -208,7 +225,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -226,7 +253,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -236,9 +262,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -300,13 +333,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/native/webview_native.target.linux-arm.mk b/android_webview/native/webview_native.target.linux-arm.mk
index c748966..fad54be 100644
--- a/android_webview/native/webview_native.target.linux-arm.mk
+++ b/android_webview/native/webview_native.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_native_android_webview_native_jni_gyp)/android_webview_native_jni.stamp
@@ -104,7 +105,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -121,7 +132,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -131,9 +141,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -205,7 +222,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -223,7 +250,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -233,9 +259,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -302,13 +335,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/native/webview_native.target.linux-mips.mk b/android_webview/native/webview_native.target.linux-mips.mk
index 5d8e36f..84275a8 100644
--- a/android_webview/native/webview_native.target.linux-mips.mk
+++ b/android_webview/native/webview_native.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_native_android_webview_native_jni_gyp)/android_webview_native_jni.stamp
@@ -103,7 +104,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -120,7 +131,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -130,9 +140,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -203,7 +220,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -221,7 +248,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -231,9 +257,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -296,13 +329,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/android_webview/native/webview_native.target.linux-x86.mk b/android_webview/native/webview_native.target.linux-x86.mk
index 012fd72..81d6708 100644
--- a/android_webview/native/webview_native.target.linux-x86.mk
+++ b/android_webview/native/webview_native.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,android_webview_native_android_webview_native_jni_gyp)/android_webview_native_jni.stamp
@@ -105,7 +106,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -122,7 +133,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -132,9 +142,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -208,7 +225,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-D__STDC_CONSTANT_MACROS' \
@@ -226,7 +253,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -236,9 +262,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -300,13 +333,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/build/common.gypi b/build/common.gypi
index f4e824c..d7b385c 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1469,7 +1469,6 @@
'use_system_expat%': '<(android_webview_build)',
'use_system_icu%': '<(android_webview_build)',
'use_system_stlport%': '<(android_webview_build)',
- 'use_system_skia%': '<(android_webview_build)',
# Copy it out one scope.
'android_webview_build%': '<(android_webview_build)',
diff --git a/cc/cc.target.darwin-arm.mk b/cc/cc.target.darwin-arm.mk
index 303b59b..f1f676d 100644
--- a/cc/cc.target.darwin-arm.mk
+++ b/cc/cc.target.darwin-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -272,7 +273,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -289,7 +300,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -298,9 +308,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -376,7 +393,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -394,7 +421,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -403,9 +429,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -474,13 +507,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/cc/cc.target.darwin-mips.mk b/cc/cc.target.darwin-mips.mk
index 91c8210..f97efc9 100644
--- a/cc/cc.target.darwin-mips.mk
+++ b/cc/cc.target.darwin-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -271,7 +272,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -288,7 +299,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -297,9 +307,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -374,7 +391,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -392,7 +419,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -401,9 +427,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -468,13 +501,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/cc/cc.target.darwin-x86.mk b/cc/cc.target.darwin-x86.mk
index 3852752..ab3893c 100644
--- a/cc/cc.target.darwin-x86.mk
+++ b/cc/cc.target.darwin-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -274,7 +275,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -291,7 +302,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -300,9 +310,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -381,7 +398,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -399,7 +426,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -408,9 +434,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -474,13 +507,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/cc/cc.target.linux-arm.mk b/cc/cc.target.linux-arm.mk
index 303b59b..f1f676d 100644
--- a/cc/cc.target.linux-arm.mk
+++ b/cc/cc.target.linux-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -272,7 +273,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -289,7 +300,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -298,9 +308,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -376,7 +393,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -394,7 +421,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -403,9 +429,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -474,13 +507,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/cc/cc.target.linux-mips.mk b/cc/cc.target.linux-mips.mk
index 91c8210..f97efc9 100644
--- a/cc/cc.target.linux-mips.mk
+++ b/cc/cc.target.linux-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -271,7 +272,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -288,7 +299,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -297,9 +307,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -374,7 +391,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -392,7 +419,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -401,9 +427,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -468,13 +501,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/cc/cc.target.linux-x86.mk b/cc/cc.target.linux-x86.mk
index 3852752..ab3893c 100644
--- a/cc/cc.target.linux-x86.mk
+++ b/cc/cc.target.linux-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -274,7 +275,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -291,7 +302,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -300,9 +310,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -381,7 +398,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DCC_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -399,7 +426,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -408,9 +434,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -474,13 +507,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_browser.target.darwin-arm.mk b/components/autofill_content_browser.target.darwin-arm.mk
index 29cff93..8ba5ba4 100644
--- a/components/autofill_content_browser.target.darwin-arm.mk
+++ b/components/autofill_content_browser.target.darwin-arm.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -100,7 +101,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -126,7 +137,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -138,9 +148,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -226,7 +243,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -253,7 +280,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -265,9 +291,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -347,6 +380,7 @@
LOCAL_STATIC_LIBRARIES := \
components_autofill_content_risk_proto_gyp \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -354,7 +388,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_browser.target.darwin-mips.mk b/components/autofill_content_browser.target.darwin-mips.mk
index cb1c33e..d07c43c 100644
--- a/components/autofill_content_browser.target.darwin-mips.mk
+++ b/components/autofill_content_browser.target.darwin-mips.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -99,7 +100,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -125,7 +136,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -137,9 +147,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -224,7 +241,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -251,7 +278,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -263,9 +289,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -341,6 +374,7 @@
LOCAL_STATIC_LIBRARIES := \
components_autofill_content_risk_proto_gyp \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -348,7 +382,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_browser.target.darwin-x86.mk b/components/autofill_content_browser.target.darwin-x86.mk
index 8a07b60..aff1445 100644
--- a/components/autofill_content_browser.target.darwin-x86.mk
+++ b/components/autofill_content_browser.target.darwin-x86.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -102,7 +103,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -127,7 +138,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -139,9 +149,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -230,7 +247,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -256,7 +283,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -268,9 +294,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -345,6 +378,7 @@
LOCAL_STATIC_LIBRARIES := \
components_autofill_content_risk_proto_gyp \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -352,7 +386,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_browser.target.linux-arm.mk b/components/autofill_content_browser.target.linux-arm.mk
index 29cff93..8ba5ba4 100644
--- a/components/autofill_content_browser.target.linux-arm.mk
+++ b/components/autofill_content_browser.target.linux-arm.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -100,7 +101,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -126,7 +137,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -138,9 +148,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -226,7 +243,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -253,7 +280,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -265,9 +291,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -347,6 +380,7 @@
LOCAL_STATIC_LIBRARIES := \
components_autofill_content_risk_proto_gyp \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -354,7 +388,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_browser.target.linux-mips.mk b/components/autofill_content_browser.target.linux-mips.mk
index cb1c33e..d07c43c 100644
--- a/components/autofill_content_browser.target.linux-mips.mk
+++ b/components/autofill_content_browser.target.linux-mips.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -99,7 +100,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -125,7 +136,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -137,9 +147,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -224,7 +241,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -251,7 +278,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -263,9 +289,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -341,6 +374,7 @@
LOCAL_STATIC_LIBRARIES := \
components_autofill_content_risk_proto_gyp \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -348,7 +382,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_browser.target.linux-x86.mk b/components/autofill_content_browser.target.linux-x86.mk
index 8a07b60..aff1445 100644
--- a/components/autofill_content_browser.target.linux-x86.mk
+++ b/components/autofill_content_browser.target.linux-x86.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,STATIC_LIBRARIES,components_autofill_content_risk_proto_gyp)/components_autofill_content_risk_proto_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -102,7 +103,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -127,7 +138,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -139,9 +149,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -230,7 +247,17 @@
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
'-DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -256,7 +283,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -268,9 +294,16 @@
$(gyp_shared_intermediate_dir)/protoc_out \
$(LOCAL_PATH)/third_party/protobuf \
$(LOCAL_PATH)/third_party/protobuf/src \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -345,6 +378,7 @@
LOCAL_STATIC_LIBRARIES := \
components_autofill_content_risk_proto_gyp \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -352,7 +386,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_common.target.darwin-arm.mk b/components/autofill_content_common.target.darwin-arm.mk
index b1dd598..631ee4e 100644
--- a/components/autofill_content_common.target.darwin-arm.mk
+++ b/components/autofill_content_common.target.darwin-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -93,7 +104,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -102,9 +112,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -175,7 +192,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -192,7 +219,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -201,9 +227,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_common.target.darwin-mips.mk b/components/autofill_content_common.target.darwin-mips.mk
index 035ee31..b97168a 100644
--- a/components/autofill_content_common.target.darwin-mips.mk
+++ b/components/autofill_content_common.target.darwin-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -92,7 +103,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -101,9 +111,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -173,7 +190,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -190,7 +217,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -199,9 +225,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -263,13 +296,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_common.target.darwin-x86.mk b/components/autofill_content_common.target.darwin-x86.mk
index d92f6df..f2f2966 100644
--- a/components/autofill_content_common.target.darwin-x86.mk
+++ b/components/autofill_content_common.target.darwin-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -95,7 +106,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -104,9 +114,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -180,7 +197,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -197,7 +224,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -206,9 +232,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_common.target.linux-arm.mk b/components/autofill_content_common.target.linux-arm.mk
index b1dd598..631ee4e 100644
--- a/components/autofill_content_common.target.linux-arm.mk
+++ b/components/autofill_content_common.target.linux-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -93,7 +104,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -102,9 +112,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -175,7 +192,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -192,7 +219,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -201,9 +227,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_common.target.linux-mips.mk b/components/autofill_content_common.target.linux-mips.mk
index 035ee31..b97168a 100644
--- a/components/autofill_content_common.target.linux-mips.mk
+++ b/components/autofill_content_common.target.linux-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -92,7 +103,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -101,9 +111,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -173,7 +190,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -190,7 +217,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -199,9 +225,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -263,13 +296,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_common.target.linux-x86.mk b/components/autofill_content_common.target.linux-x86.mk
index d92f6df..f2f2966 100644
--- a/components/autofill_content_common.target.linux-x86.mk
+++ b/components/autofill_content_common.target.linux-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -95,7 +106,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -104,9 +114,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -180,7 +197,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -197,7 +224,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -206,9 +232,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_renderer.target.darwin-arm.mk b/components/autofill_content_renderer.target.darwin-arm.mk
index f404782..e48469a 100644
--- a/components/autofill_content_renderer.target.darwin-arm.mk
+++ b/components/autofill_content_renderer.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp
GYP_GENERATED_OUTPUTS :=
@@ -84,7 +85,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -99,7 +110,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -108,9 +118,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -180,7 +197,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -196,7 +223,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -205,9 +231,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -272,13 +305,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_renderer.target.darwin-mips.mk b/components/autofill_content_renderer.target.darwin-mips.mk
index 2a14f70..aa09f53 100644
--- a/components/autofill_content_renderer.target.darwin-mips.mk
+++ b/components/autofill_content_renderer.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp
GYP_GENERATED_OUTPUTS :=
@@ -83,7 +84,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -98,7 +109,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -107,9 +117,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -178,7 +195,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -194,7 +221,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -203,9 +229,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -266,13 +299,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_renderer.target.darwin-x86.mk b/components/autofill_content_renderer.target.darwin-x86.mk
index 2aff4ba..90a14c7 100644
--- a/components/autofill_content_renderer.target.darwin-x86.mk
+++ b/components/autofill_content_renderer.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp
GYP_GENERATED_OUTPUTS :=
@@ -86,7 +87,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -110,9 +120,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -185,7 +202,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -201,7 +228,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -210,9 +236,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -272,13 +305,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_renderer.target.linux-arm.mk b/components/autofill_content_renderer.target.linux-arm.mk
index f404782..e48469a 100644
--- a/components/autofill_content_renderer.target.linux-arm.mk
+++ b/components/autofill_content_renderer.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp
GYP_GENERATED_OUTPUTS :=
@@ -84,7 +85,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -99,7 +110,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -108,9 +118,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -180,7 +197,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -196,7 +223,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -205,9 +231,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -272,13 +305,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_renderer.target.linux-mips.mk b/components/autofill_content_renderer.target.linux-mips.mk
index 2a14f70..aa09f53 100644
--- a/components/autofill_content_renderer.target.linux-mips.mk
+++ b/components/autofill_content_renderer.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp
GYP_GENERATED_OUTPUTS :=
@@ -83,7 +84,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -98,7 +109,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -107,9 +117,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -178,7 +195,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -194,7 +221,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -203,9 +229,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -266,13 +299,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_content_renderer.target.linux-x86.mk b/components/autofill_content_renderer.target.linux-x86.mk
index 2aff4ba..90a14c7 100644
--- a/components/autofill_content_renderer.target.linux-x86.mk
+++ b/components/autofill_content_renderer.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp
GYP_GENERATED_OUTPUTS :=
@@ -86,7 +87,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -110,9 +120,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -185,7 +202,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -201,7 +228,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -210,9 +236,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/components/strings \
$(PWD)/frameworks/wilhelm/include \
@@ -272,13 +305,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_browser.target.darwin-arm.mk b/components/autofill_core_browser.target.darwin-arm.mk
index 7ab0166..568f5fc 100644
--- a/components/autofill_core_browser.target.darwin-arm.mk
+++ b/components/autofill_core_browser.target.darwin-arm.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -124,7 +125,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -153,7 +164,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -163,9 +173,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -250,7 +267,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -280,7 +307,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -290,9 +316,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -373,6 +406,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -380,7 +414,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_browser.target.darwin-mips.mk b/components/autofill_core_browser.target.darwin-mips.mk
index da2b745..e43eb6a 100644
--- a/components/autofill_core_browser.target.darwin-mips.mk
+++ b/components/autofill_core_browser.target.darwin-mips.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -123,7 +124,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -152,7 +163,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -162,9 +172,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -248,7 +265,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -278,7 +305,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -288,9 +314,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -367,6 +400,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -374,7 +408,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_browser.target.darwin-x86.mk b/components/autofill_core_browser.target.darwin-x86.mk
index 35ede87..1a0e678 100644
--- a/components/autofill_core_browser.target.darwin-x86.mk
+++ b/components/autofill_core_browser.target.darwin-x86.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -126,7 +127,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -154,7 +165,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -164,9 +174,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -254,7 +271,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -283,7 +310,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -293,9 +319,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -371,6 +404,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -378,7 +412,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_browser.target.linux-arm.mk b/components/autofill_core_browser.target.linux-arm.mk
index 7ab0166..568f5fc 100644
--- a/components/autofill_core_browser.target.linux-arm.mk
+++ b/components/autofill_core_browser.target.linux-arm.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -124,7 +125,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -153,7 +164,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -163,9 +173,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -250,7 +267,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -280,7 +307,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -290,9 +316,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -373,6 +406,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -380,7 +414,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_browser.target.linux-mips.mk b/components/autofill_core_browser.target.linux-mips.mk
index da2b745..e43eb6a 100644
--- a/components/autofill_core_browser.target.linux-mips.mk
+++ b/components/autofill_core_browser.target.linux-mips.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -123,7 +124,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -152,7 +163,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -162,9 +172,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -248,7 +265,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -278,7 +305,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -288,9 +314,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -367,6 +400,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -374,7 +408,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_browser.target.linux-x86.mk b/components/autofill_core_browser.target.linux-x86.mk
index 35ede87..1a0e678 100644
--- a/components/autofill_core_browser.target.linux-x86.mk
+++ b/components/autofill_core_browser.target.linux-x86.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,components_autofill_regexes_gyp)/autofill_regexes.stamp \
$(call intermediates-dir-for,GYP,components_component_strings_gyp)/component_strings.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_libphonenumber_libphonenumber_without_metadata_gyp)/third_party_libphonenumber_libphonenumber_without_metadata_gyp.a \
@@ -126,7 +127,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -154,7 +165,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -164,9 +174,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -254,7 +271,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DFEATURE_ENABLE_SSL' \
'-DFEATURE_ENABLE_VOICEMAIL' \
@@ -283,7 +310,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -293,9 +319,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/components/strings \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -371,6 +404,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp \
ui_ui_gyp
@@ -378,7 +412,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_common.target.darwin-arm.mk b/components/autofill_core_common.target.darwin-arm.mk
index 547a4c1..3468b89 100644
--- a/components/autofill_core_common.target.darwin-arm.mk
+++ b/components/autofill_core_common.target.darwin-arm.mk
@@ -11,6 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_jni_headers_gyp)/autofill_jni_headers.stamp
@@ -93,7 +94,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -110,16 +121,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -208,16 +235,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_common.target.darwin-mips.mk b/components/autofill_core_common.target.darwin-mips.mk
index fa007ac..b83547e 100644
--- a/components/autofill_core_common.target.darwin-mips.mk
+++ b/components/autofill_core_common.target.darwin-mips.mk
@@ -11,6 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_jni_headers_gyp)/autofill_jni_headers.stamp
@@ -92,7 +93,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -109,16 +120,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -206,16 +233,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -278,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_common.target.darwin-x86.mk b/components/autofill_core_common.target.darwin-x86.mk
index aa2f061..45cdfad 100644
--- a/components/autofill_core_common.target.darwin-x86.mk
+++ b/components/autofill_core_common.target.darwin-x86.mk
@@ -11,6 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_jni_headers_gyp)/autofill_jni_headers.stamp
@@ -95,7 +96,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -111,16 +122,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -194,7 +211,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -211,16 +238,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -282,13 +315,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_common.target.linux-arm.mk b/components/autofill_core_common.target.linux-arm.mk
index 547a4c1..3468b89 100644
--- a/components/autofill_core_common.target.linux-arm.mk
+++ b/components/autofill_core_common.target.linux-arm.mk
@@ -11,6 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_jni_headers_gyp)/autofill_jni_headers.stamp
@@ -93,7 +94,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -110,16 +121,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -208,16 +235,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_common.target.linux-mips.mk b/components/autofill_core_common.target.linux-mips.mk
index fa007ac..b83547e 100644
--- a/components/autofill_core_common.target.linux-mips.mk
+++ b/components/autofill_core_common.target.linux-mips.mk
@@ -11,6 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_jni_headers_gyp)/autofill_jni_headers.stamp
@@ -92,7 +93,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -109,16 +120,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -206,16 +233,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -278,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/autofill_core_common.target.linux-x86.mk b/components/autofill_core_common.target.linux-x86.mk
index aa2f061..45cdfad 100644
--- a/components/autofill_core_common.target.linux-x86.mk
+++ b/components/autofill_core_common.target.linux-x86.mk
@@ -11,6 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,components_autofill_jni_headers_gyp)/autofill_jni_headers.stamp
@@ -95,7 +96,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -111,16 +122,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -194,7 +211,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -211,16 +238,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/autofill \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -282,13 +315,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/navigation_interception.gypi b/components/navigation_interception.gypi
index 719c320..993a916 100644
--- a/components/navigation_interception.gypi
+++ b/components/navigation_interception.gypi
@@ -16,7 +16,6 @@
'../content/content.gyp:content_browser',
'../content/content.gyp:content_common',
'../net/net.gyp:net',
- '../skia/skia.gyp:skia',
],
'include_dirs': [
'..',
diff --git a/components/navigation_interception.target.darwin-arm.mk b/components/navigation_interception.target.darwin-arm.mk
index f0f5402..4f165a7 100644
--- a/components/navigation_interception.target.darwin-arm.mk
+++ b/components/navigation_interception.target.darwin-arm.mk
@@ -11,7 +11,6 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
$(call intermediates-dir-for,GYP,components_navigation_interception_jni_headers_gyp)/navigation_interception_jni_headers.stamp
GYP_GENERATED_OUTPUTS :=
@@ -83,7 +82,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -98,7 +96,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -108,10 +105,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -180,7 +173,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -196,7 +188,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -206,10 +197,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -278,7 +265,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/navigation_interception.target.darwin-mips.mk b/components/navigation_interception.target.darwin-mips.mk
index 90e8f65..10092b4 100644
--- a/components/navigation_interception.target.darwin-mips.mk
+++ b/components/navigation_interception.target.darwin-mips.mk
@@ -11,7 +11,6 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
$(call intermediates-dir-for,GYP,components_navigation_interception_jni_headers_gyp)/navigation_interception_jni_headers.stamp
GYP_GENERATED_OUTPUTS :=
@@ -82,7 +81,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -97,7 +95,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -107,10 +104,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -178,7 +171,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -194,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -204,10 +195,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -272,7 +259,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/navigation_interception.target.darwin-x86.mk b/components/navigation_interception.target.darwin-x86.mk
index f35e21d..602fc2d 100644
--- a/components/navigation_interception.target.darwin-x86.mk
+++ b/components/navigation_interception.target.darwin-x86.mk
@@ -11,7 +11,6 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
$(call intermediates-dir-for,GYP,components_navigation_interception_jni_headers_gyp)/navigation_interception_jni_headers.stamp
GYP_GENERATED_OUTPUTS :=
@@ -84,7 +83,6 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -99,7 +97,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,10 +106,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -183,7 +176,6 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -199,7 +191,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -209,10 +200,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -276,7 +263,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/navigation_interception.target.linux-arm.mk b/components/navigation_interception.target.linux-arm.mk
index f0f5402..4f165a7 100644
--- a/components/navigation_interception.target.linux-arm.mk
+++ b/components/navigation_interception.target.linux-arm.mk
@@ -11,7 +11,6 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
$(call intermediates-dir-for,GYP,components_navigation_interception_jni_headers_gyp)/navigation_interception_jni_headers.stamp
GYP_GENERATED_OUTPUTS :=
@@ -83,7 +82,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -98,7 +96,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -108,10 +105,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -180,7 +173,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -196,7 +188,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -206,10 +197,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -278,7 +265,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/navigation_interception.target.linux-mips.mk b/components/navigation_interception.target.linux-mips.mk
index 90e8f65..10092b4 100644
--- a/components/navigation_interception.target.linux-mips.mk
+++ b/components/navigation_interception.target.linux-mips.mk
@@ -11,7 +11,6 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
$(call intermediates-dir-for,GYP,components_navigation_interception_jni_headers_gyp)/navigation_interception_jni_headers.stamp
GYP_GENERATED_OUTPUTS :=
@@ -82,7 +81,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -97,7 +95,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -107,10 +104,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -178,7 +171,6 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -194,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -204,10 +195,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -272,7 +259,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/navigation_interception.target.linux-x86.mk b/components/navigation_interception.target.linux-x86.mk
index f35e21d..602fc2d 100644
--- a/components/navigation_interception.target.linux-x86.mk
+++ b/components/navigation_interception.target.linux-x86.mk
@@ -11,7 +11,6 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
$(call intermediates-dir-for,GYP,components_navigation_interception_jni_headers_gyp)/navigation_interception_jni_headers.stamp
GYP_GENERATED_OUTPUTS :=
@@ -84,7 +83,6 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -99,7 +97,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,10 +106,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -183,7 +176,6 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
- '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -199,7 +191,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -209,10 +200,6 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -276,7 +263,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/user_prefs.target.darwin-arm.mk b/components/user_prefs.target.darwin-arm.mk
index 11eef18..6b8c840 100644
--- a/components/user_prefs.target.darwin-arm.mk
+++ b/components/user_prefs.target.darwin-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -80,7 +81,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -96,7 +107,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -105,9 +115,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -180,7 +197,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -197,7 +224,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -206,9 +232,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -275,13 +308,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/user_prefs.target.darwin-mips.mk b/components/user_prefs.target.darwin-mips.mk
index e434d73..0877d43 100644
--- a/components/user_prefs.target.darwin-mips.mk
+++ b/components/user_prefs.target.darwin-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -95,7 +106,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -104,9 +114,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -178,7 +195,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -195,7 +222,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -204,9 +230,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/user_prefs.target.darwin-x86.mk b/components/user_prefs.target.darwin-x86.mk
index febe4f1..9594594 100644
--- a/components/user_prefs.target.darwin-x86.mk
+++ b/components/user_prefs.target.darwin-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -81,7 +82,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -97,7 +108,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -106,9 +116,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -183,7 +200,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -200,7 +227,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -209,9 +235,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -273,13 +306,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/user_prefs.target.linux-arm.mk b/components/user_prefs.target.linux-arm.mk
index 11eef18..6b8c840 100644
--- a/components/user_prefs.target.linux-arm.mk
+++ b/components/user_prefs.target.linux-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -80,7 +81,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -96,7 +107,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -105,9 +115,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -180,7 +197,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -197,7 +224,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -206,9 +232,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -275,13 +308,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/user_prefs.target.linux-mips.mk b/components/user_prefs.target.linux-mips.mk
index e434d73..0877d43 100644
--- a/components/user_prefs.target.linux-mips.mk
+++ b/components/user_prefs.target.linux-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -95,7 +106,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -104,9 +114,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -178,7 +195,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -195,7 +222,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -204,9 +230,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/user_prefs.target.linux-x86.mk b/components/user_prefs.target.linux-x86.mk
index febe4f1..9594594 100644
--- a/components/user_prefs.target.linux-x86.mk
+++ b/components/user_prefs.target.linux-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -81,7 +82,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -97,7 +108,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -106,9 +116,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -183,7 +200,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUSER_PREFS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -200,7 +227,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -209,9 +235,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -273,13 +306,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/visitedlink_browser.target.darwin-arm.mk b/components/visitedlink_browser.target.darwin-arm.mk
index b9173cf..57aca20 100644
--- a/components/visitedlink_browser.target.darwin-arm.mk
+++ b/components/visitedlink_browser.target.darwin-arm.mk
@@ -91,7 +91,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -182,7 +181,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_browser.target.darwin-mips.mk b/components/visitedlink_browser.target.darwin-mips.mk
index a51ca97..b5237a4 100644
--- a/components/visitedlink_browser.target.darwin-mips.mk
+++ b/components/visitedlink_browser.target.darwin-mips.mk
@@ -90,7 +90,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -180,7 +179,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_browser.target.darwin-x86.mk b/components/visitedlink_browser.target.darwin-x86.mk
index 4643ef5..df48a49 100644
--- a/components/visitedlink_browser.target.darwin-x86.mk
+++ b/components/visitedlink_browser.target.darwin-x86.mk
@@ -93,7 +93,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -187,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_browser.target.linux-arm.mk b/components/visitedlink_browser.target.linux-arm.mk
index b9173cf..57aca20 100644
--- a/components/visitedlink_browser.target.linux-arm.mk
+++ b/components/visitedlink_browser.target.linux-arm.mk
@@ -91,7 +91,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -182,7 +181,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_browser.target.linux-mips.mk b/components/visitedlink_browser.target.linux-mips.mk
index a51ca97..b5237a4 100644
--- a/components/visitedlink_browser.target.linux-mips.mk
+++ b/components/visitedlink_browser.target.linux-mips.mk
@@ -90,7 +90,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -180,7 +179,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_browser.target.linux-x86.mk b/components/visitedlink_browser.target.linux-x86.mk
index 4643ef5..df48a49 100644
--- a/components/visitedlink_browser.target.linux-x86.mk
+++ b/components/visitedlink_browser.target.linux-x86.mk
@@ -93,7 +93,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -187,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_common.target.darwin-arm.mk b/components/visitedlink_common.target.darwin-arm.mk
index 070b6ce..f5b429b 100644
--- a/components/visitedlink_common.target.darwin-arm.mk
+++ b/components/visitedlink_common.target.darwin-arm.mk
@@ -91,7 +91,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -182,7 +181,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_common.target.darwin-mips.mk b/components/visitedlink_common.target.darwin-mips.mk
index 5040b4e..df7fa0d 100644
--- a/components/visitedlink_common.target.darwin-mips.mk
+++ b/components/visitedlink_common.target.darwin-mips.mk
@@ -90,7 +90,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -180,7 +179,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_common.target.darwin-x86.mk b/components/visitedlink_common.target.darwin-x86.mk
index 22f7654..d646232 100644
--- a/components/visitedlink_common.target.darwin-x86.mk
+++ b/components/visitedlink_common.target.darwin-x86.mk
@@ -93,7 +93,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -187,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_common.target.linux-arm.mk b/components/visitedlink_common.target.linux-arm.mk
index 070b6ce..f5b429b 100644
--- a/components/visitedlink_common.target.linux-arm.mk
+++ b/components/visitedlink_common.target.linux-arm.mk
@@ -91,7 +91,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -182,7 +181,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_common.target.linux-mips.mk b/components/visitedlink_common.target.linux-mips.mk
index 5040b4e..df7fa0d 100644
--- a/components/visitedlink_common.target.linux-mips.mk
+++ b/components/visitedlink_common.target.linux-mips.mk
@@ -90,7 +90,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -180,7 +179,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_common.target.linux-x86.mk b/components/visitedlink_common.target.linux-x86.mk
index 22f7654..d646232 100644
--- a/components/visitedlink_common.target.linux-x86.mk
+++ b/components/visitedlink_common.target.linux-x86.mk
@@ -93,7 +93,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -187,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/visitedlink_renderer.target.darwin-arm.mk b/components/visitedlink_renderer.target.darwin-arm.mk
index bfbb5fa..3d168b4 100644
--- a/components/visitedlink_renderer.target.darwin-arm.mk
+++ b/components/visitedlink_renderer.target.darwin-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -97,7 +108,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -107,9 +117,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -211,7 +238,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -221,9 +247,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -299,13 +332,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/visitedlink_renderer.target.darwin-mips.mk b/components/visitedlink_renderer.target.darwin-mips.mk
index 670bd10..c5b58a9 100644
--- a/components/visitedlink_renderer.target.darwin-mips.mk
+++ b/components/visitedlink_renderer.target.darwin-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -96,7 +107,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -106,9 +116,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -209,7 +236,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -219,9 +245,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -293,13 +326,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/visitedlink_renderer.target.darwin-x86.mk b/components/visitedlink_renderer.target.darwin-x86.mk
index 1e23e79..4481050 100644
--- a/components/visitedlink_renderer.target.darwin-x86.mk
+++ b/components/visitedlink_renderer.target.darwin-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -99,7 +110,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,9 +119,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -195,7 +212,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -216,7 +243,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -226,9 +252,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -299,13 +332,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/visitedlink_renderer.target.linux-arm.mk b/components/visitedlink_renderer.target.linux-arm.mk
index bfbb5fa..3d168b4 100644
--- a/components/visitedlink_renderer.target.linux-arm.mk
+++ b/components/visitedlink_renderer.target.linux-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -97,7 +108,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -107,9 +117,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -211,7 +238,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -221,9 +247,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -299,13 +332,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/visitedlink_renderer.target.linux-mips.mk b/components/visitedlink_renderer.target.linux-mips.mk
index 670bd10..c5b58a9 100644
--- a/components/visitedlink_renderer.target.linux-mips.mk
+++ b/components/visitedlink_renderer.target.linux-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -96,7 +107,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -106,9 +116,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -209,7 +236,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -219,9 +245,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -293,13 +326,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/visitedlink_renderer.target.linux-x86.mk b/components/visitedlink_renderer.target.linux-x86.mk
index 1e23e79..4481050 100644
--- a/components/visitedlink_renderer.target.linux-x86.mk
+++ b/components/visitedlink_renderer.target.linux-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -99,7 +110,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,9 +119,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -195,7 +212,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -216,7 +243,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -226,9 +252,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -299,13 +332,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/web_contents_delegate_android.target.darwin-arm.mk b/components/web_contents_delegate_android.target.darwin-arm.mk
index afa6022..283fcda 100644
--- a/components/web_contents_delegate_android.target.darwin-arm.mk
+++ b/components/web_contents_delegate_android.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,webkit_glue_glue_gyp)/webkit_glue_glue_gyp.a \
$(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp
@@ -84,7 +85,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -100,7 +111,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -110,9 +120,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -184,7 +201,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -201,7 +228,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -211,9 +237,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,6 +313,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_glue_glue_gyp
@@ -287,7 +321,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/web_contents_delegate_android.target.darwin-mips.mk b/components/web_contents_delegate_android.target.darwin-mips.mk
index af7a3ea..801d0d2 100644
--- a/components/web_contents_delegate_android.target.darwin-mips.mk
+++ b/components/web_contents_delegate_android.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,webkit_glue_glue_gyp)/webkit_glue_glue_gyp.a \
$(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp
@@ -83,7 +84,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -99,7 +110,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,9 +119,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -182,7 +199,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -199,7 +226,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -209,9 +235,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -274,6 +307,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_glue_glue_gyp
@@ -281,7 +315,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/web_contents_delegate_android.target.darwin-x86.mk b/components/web_contents_delegate_android.target.darwin-x86.mk
index 9505868..1652564 100644
--- a/components/web_contents_delegate_android.target.darwin-x86.mk
+++ b/components/web_contents_delegate_android.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,webkit_glue_glue_gyp)/webkit_glue_glue_gyp.a \
$(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp
@@ -85,7 +86,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -111,9 +121,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -187,7 +204,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -204,7 +231,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -214,9 +240,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -278,6 +311,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_glue_glue_gyp
@@ -285,7 +319,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/web_contents_delegate_android.target.linux-arm.mk b/components/web_contents_delegate_android.target.linux-arm.mk
index afa6022..283fcda 100644
--- a/components/web_contents_delegate_android.target.linux-arm.mk
+++ b/components/web_contents_delegate_android.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,webkit_glue_glue_gyp)/webkit_glue_glue_gyp.a \
$(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp
@@ -84,7 +85,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -100,7 +111,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -110,9 +120,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -184,7 +201,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -201,7 +228,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -211,9 +237,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,6 +313,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_glue_glue_gyp
@@ -287,7 +321,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/web_contents_delegate_android.target.linux-mips.mk b/components/web_contents_delegate_android.target.linux-mips.mk
index af7a3ea..801d0d2 100644
--- a/components/web_contents_delegate_android.target.linux-mips.mk
+++ b/components/web_contents_delegate_android.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,webkit_glue_glue_gyp)/webkit_glue_glue_gyp.a \
$(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp
@@ -83,7 +84,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -99,7 +110,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,9 +119,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -182,7 +199,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -199,7 +226,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -209,9 +235,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -274,6 +307,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_glue_glue_gyp
@@ -281,7 +315,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/web_contents_delegate_android.target.linux-x86.mk b/components/web_contents_delegate_android.target.linux-x86.mk
index 9505868..1652564 100644
--- a/components/web_contents_delegate_android.target.linux-x86.mk
+++ b/components/web_contents_delegate_android.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,webkit_glue_glue_gyp)/webkit_glue_glue_gyp.a \
$(call intermediates-dir-for,GYP,components_web_contents_delegate_android_jni_headers_gyp)/web_contents_delegate_android_jni_headers.stamp
@@ -85,7 +86,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -111,9 +121,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -187,7 +204,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -204,7 +231,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -214,9 +240,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -278,6 +311,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_glue_glue_gyp
@@ -285,7 +319,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/components/webdata_common.target.darwin-arm.mk b/components/webdata_common.target.darwin-arm.mk
index 8bca401..c587bad 100644
--- a/components/webdata_common.target.darwin-arm.mk
+++ b/components/webdata_common.target.darwin-arm.mk
@@ -97,7 +97,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -189,7 +188,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/webdata_common.target.darwin-mips.mk b/components/webdata_common.target.darwin-mips.mk
index 6357853..54daf9f 100644
--- a/components/webdata_common.target.darwin-mips.mk
+++ b/components/webdata_common.target.darwin-mips.mk
@@ -96,7 +96,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -187,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/webdata_common.target.darwin-x86.mk b/components/webdata_common.target.darwin-x86.mk
index cd8e5516..4927cda 100644
--- a/components/webdata_common.target.darwin-x86.mk
+++ b/components/webdata_common.target.darwin-x86.mk
@@ -99,7 +99,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -194,7 +193,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/webdata_common.target.linux-arm.mk b/components/webdata_common.target.linux-arm.mk
index 8bca401..c587bad 100644
--- a/components/webdata_common.target.linux-arm.mk
+++ b/components/webdata_common.target.linux-arm.mk
@@ -97,7 +97,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -189,7 +188,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/webdata_common.target.linux-mips.mk b/components/webdata_common.target.linux-mips.mk
index 6357853..54daf9f 100644
--- a/components/webdata_common.target.linux-mips.mk
+++ b/components/webdata_common.target.linux-mips.mk
@@ -96,7 +96,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -187,7 +186,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/components/webdata_common.target.linux-x86.mk b/components/webdata_common.target.linux-x86.mk
index cd8e5516..4927cda 100644
--- a/components/webdata_common.target.linux-x86.mk
+++ b/components/webdata_common.target.linux-x86.mk
@@ -99,7 +99,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -194,7 +193,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/content/content_app_both.target.darwin-arm.mk b/content/content_app_both.target.darwin-arm.mk
index d6f8b81..c7be7d0 100644
--- a/content/content_app_both.target.darwin-arm.mk
+++ b/content/content_app_both.target.darwin-arm.mk
@@ -13,7 +13,8 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_jni_headers_gyp)/content_jni_headers.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -87,7 +88,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -102,7 +113,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -114,9 +124,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -188,7 +205,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -204,7 +231,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -216,9 +242,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -284,13 +317,13 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_app_both.target.darwin-mips.mk b/content/content_app_both.target.darwin-mips.mk
index 009ca1b..fce3a30 100644
--- a/content/content_app_both.target.darwin-mips.mk
+++ b/content/content_app_both.target.darwin-mips.mk
@@ -13,7 +13,8 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_jni_headers_gyp)/content_jni_headers.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -86,7 +87,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -113,9 +123,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -186,7 +203,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -202,7 +229,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -214,9 +240,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -278,13 +311,13 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_app_both.target.darwin-x86.mk b/content/content_app_both.target.darwin-x86.mk
index 66ccc8f..e4683dd 100644
--- a/content/content_app_both.target.darwin-x86.mk
+++ b/content/content_app_both.target.darwin-x86.mk
@@ -13,7 +13,8 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_jni_headers_gyp)/content_jni_headers.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -115,9 +125,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -191,7 +208,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -207,7 +234,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -219,9 +245,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -282,13 +315,13 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_app_both.target.linux-arm.mk b/content/content_app_both.target.linux-arm.mk
index d6f8b81..c7be7d0 100644
--- a/content/content_app_both.target.linux-arm.mk
+++ b/content/content_app_both.target.linux-arm.mk
@@ -13,7 +13,8 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_jni_headers_gyp)/content_jni_headers.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -87,7 +88,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -102,7 +113,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -114,9 +124,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -188,7 +205,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -204,7 +231,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -216,9 +242,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -284,13 +317,13 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_app_both.target.linux-mips.mk b/content/content_app_both.target.linux-mips.mk
index 009ca1b..fce3a30 100644
--- a/content/content_app_both.target.linux-mips.mk
+++ b/content/content_app_both.target.linux-mips.mk
@@ -13,7 +13,8 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_jni_headers_gyp)/content_jni_headers.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -86,7 +87,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -113,9 +123,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -186,7 +203,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -202,7 +229,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -214,9 +240,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -278,13 +311,13 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_app_both.target.linux-x86.mk b/content/content_app_both.target.linux-x86.mk
index 66ccc8f..e4683dd 100644
--- a/content/content_app_both.target.linux-x86.mk
+++ b/content/content_app_both.target.linux-x86.mk
@@ -13,7 +13,8 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_jni_headers_gyp)/content_jni_headers.stamp \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -115,9 +125,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -191,7 +208,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DU_USING_ICU_NAMESPACE=0' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -207,7 +234,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -219,9 +245,16 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -282,13 +315,13 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
- ui_ui_gyp
+ ui_ui_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_browser.target.darwin-arm.mk b/content/content_browser.target.darwin-arm.mk
index defc2fc..dddad20 100644
--- a/content/content_browser.target.darwin-arm.mk
+++ b/content/content_browser.target.darwin-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,content_browser_speech_proto_speech_proto_gyp)/content_browser_speech_proto_speech_proto_gyp.a \
@@ -496,7 +497,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -521,7 +532,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -532,9 +542,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -628,7 +645,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -654,7 +681,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -665,9 +691,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -754,6 +787,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
content_browser_speech_proto_speech_proto_gyp
@@ -761,7 +795,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_browser.target.darwin-mips.mk b/content/content_browser.target.darwin-mips.mk
index c7d812d..5e68051 100644
--- a/content/content_browser.target.darwin-mips.mk
+++ b/content/content_browser.target.darwin-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,content_browser_speech_proto_speech_proto_gyp)/content_browser_speech_proto_speech_proto_gyp.a \
@@ -495,7 +496,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -520,7 +531,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -531,9 +541,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -626,7 +643,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -652,7 +679,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -663,9 +689,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -748,6 +781,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
content_browser_speech_proto_speech_proto_gyp
@@ -755,7 +789,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_browser.target.darwin-x86.mk b/content/content_browser.target.darwin-x86.mk
index 6e51e6f..2f33f2e 100644
--- a/content/content_browser.target.darwin-x86.mk
+++ b/content/content_browser.target.darwin-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,content_browser_speech_proto_speech_proto_gyp)/content_browser_speech_proto_speech_proto_gyp.a \
@@ -497,7 +498,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -522,7 +533,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -533,9 +543,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -631,7 +648,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -657,7 +684,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -668,9 +694,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -752,6 +785,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
content_browser_speech_proto_speech_proto_gyp
@@ -759,7 +793,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_browser.target.linux-arm.mk b/content/content_browser.target.linux-arm.mk
index defc2fc..dddad20 100644
--- a/content/content_browser.target.linux-arm.mk
+++ b/content/content_browser.target.linux-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,content_browser_speech_proto_speech_proto_gyp)/content_browser_speech_proto_speech_proto_gyp.a \
@@ -496,7 +497,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -521,7 +532,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -532,9 +542,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -628,7 +645,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -654,7 +681,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -665,9 +691,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -754,6 +787,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
content_browser_speech_proto_speech_proto_gyp
@@ -761,7 +795,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_browser.target.linux-mips.mk b/content/content_browser.target.linux-mips.mk
index c7d812d..5e68051 100644
--- a/content/content_browser.target.linux-mips.mk
+++ b/content/content_browser.target.linux-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,content_browser_speech_proto_speech_proto_gyp)/content_browser_speech_proto_speech_proto_gyp.a \
@@ -495,7 +496,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -520,7 +531,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -531,9 +541,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -626,7 +643,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -652,7 +679,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -663,9 +689,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -748,6 +781,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
content_browser_speech_proto_speech_proto_gyp
@@ -755,7 +789,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_browser.target.linux-x86.mk b/content/content_browser.target.linux-x86.mk
index 6e51e6f..2f33f2e 100644
--- a/content/content_browser.target.linux-x86.mk
+++ b/content/content_browser.target.linux-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,content_browser_speech_proto_speech_proto_gyp)/content_browser_speech_proto_speech_proto_gyp.a \
@@ -497,7 +498,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -522,7 +533,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -533,9 +543,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -631,7 +648,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DAVOID_LIBYUV_FOR_ANDROID_WEBVIEW' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPROTOBUF_USE_DLLS' \
'-DGOOGLE_PROTOBUF_NO_RTTI' \
@@ -657,7 +684,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -668,9 +694,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/re2 \
$(LOCAL_PATH)/third_party/zlib \
@@ -752,6 +785,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
content_browser_speech_proto_speech_proto_gyp
@@ -759,7 +793,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_child.target.darwin-arm.mk b/content/content_child.target.darwin-arm.mk
index 076813b..24ae4c0 100644
--- a/content/content_child.target.darwin-arm.mk
+++ b/content/content_child.target.darwin-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -133,7 +134,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -154,9 +165,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -164,9 +174,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -249,7 +266,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -271,9 +298,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -281,9 +307,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -362,6 +395,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_child_webkit_child_gyp
@@ -369,7 +403,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_child.target.darwin-mips.mk b/content/content_child.target.darwin-mips.mk
index e9cdc8c..282d6e2 100644
--- a/content/content_child.target.darwin-mips.mk
+++ b/content/content_child.target.darwin-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -132,7 +133,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -153,9 +164,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -163,9 +173,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -247,7 +264,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -269,9 +296,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -279,9 +305,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -356,6 +389,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_child_webkit_child_gyp
@@ -363,7 +397,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_child.target.darwin-x86.mk b/content/content_child.target.darwin-x86.mk
index 7f5775e..3d01d88 100644
--- a/content/content_child.target.darwin-x86.mk
+++ b/content/content_child.target.darwin-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -135,7 +136,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -155,9 +166,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -165,9 +175,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -253,7 +270,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -274,9 +301,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -284,9 +310,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -360,6 +393,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_child_webkit_child_gyp
@@ -367,7 +401,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_child.target.linux-arm.mk b/content/content_child.target.linux-arm.mk
index 076813b..24ae4c0 100644
--- a/content/content_child.target.linux-arm.mk
+++ b/content/content_child.target.linux-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -133,7 +134,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -154,9 +165,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -164,9 +174,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -249,7 +266,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -271,9 +298,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -281,9 +307,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -362,6 +395,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_child_webkit_child_gyp
@@ -369,7 +403,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_child.target.linux-mips.mk b/content/content_child.target.linux-mips.mk
index e9cdc8c..282d6e2 100644
--- a/content/content_child.target.linux-mips.mk
+++ b/content/content_child.target.linux-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -132,7 +133,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -153,9 +164,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -163,9 +173,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -247,7 +264,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -269,9 +296,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -279,9 +305,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -356,6 +389,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_child_webkit_child_gyp
@@ -363,7 +397,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_child.target.linux-x86.mk b/content/content_child.target.linux-x86.mk
index 7f5775e..3d01d88 100644
--- a/content/content_child.target.linux-x86.mk
+++ b/content/content_child.target.linux-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -135,7 +136,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -155,9 +166,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -165,9 +175,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -253,7 +270,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -274,9 +301,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -284,9 +310,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -360,6 +393,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
ui_ui_gyp \
webkit_child_webkit_child_gyp
@@ -367,7 +401,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_common.target.darwin-arm.mk b/content/content_common.target.darwin-arm.mk
index fa3a838..917bfc4 100644
--- a/content/content_common.target.darwin-arm.mk
+++ b/content/content_common.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
@@ -205,7 +206,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -228,7 +239,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -237,9 +247,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -327,7 +344,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -351,7 +378,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -360,9 +386,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -443,6 +476,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
ui_gl_gl_gyp \
webkit_glue_glue_gyp
@@ -451,7 +485,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_common.target.darwin-mips.mk b/content/content_common.target.darwin-mips.mk
index b8c0368..182a7e2 100644
--- a/content/content_common.target.darwin-mips.mk
+++ b/content/content_common.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
@@ -204,7 +205,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -227,7 +238,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -236,9 +246,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -325,7 +342,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -349,7 +376,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -358,9 +384,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -437,6 +470,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
ui_gl_gl_gyp \
webkit_glue_glue_gyp
@@ -445,7 +479,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_common.target.darwin-x86.mk b/content/content_common.target.darwin-x86.mk
index eaf4410..767ecb3 100644
--- a/content/content_common.target.darwin-x86.mk
+++ b/content/content_common.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
@@ -206,7 +207,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -229,7 +240,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -238,9 +248,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -330,7 +347,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -354,7 +381,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -363,9 +389,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -441,6 +474,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
ui_gl_gl_gyp \
webkit_glue_glue_gyp
@@ -449,7 +483,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_common.target.linux-arm.mk b/content/content_common.target.linux-arm.mk
index fa3a838..917bfc4 100644
--- a/content/content_common.target.linux-arm.mk
+++ b/content/content_common.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
@@ -205,7 +206,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -228,7 +239,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -237,9 +247,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -327,7 +344,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -351,7 +378,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -360,9 +386,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -443,6 +476,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
ui_gl_gl_gyp \
webkit_glue_glue_gyp
@@ -451,7 +485,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_common.target.linux-mips.mk b/content/content_common.target.linux-mips.mk
index b8c0368..182a7e2 100644
--- a/content/content_common.target.linux-mips.mk
+++ b/content/content_common.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
@@ -204,7 +205,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -227,7 +238,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -236,9 +246,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -325,7 +342,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -349,7 +376,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -358,9 +384,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -437,6 +470,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
ui_gl_gl_gyp \
webkit_glue_glue_gyp
@@ -445,7 +479,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_common.target.linux-x86.mk b/content/content_common.target.linux-x86.mk
index eaf4410..767ecb3 100644
--- a/content/content_common.target.linux-x86.mk
+++ b/content/content_common.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
@@ -206,7 +207,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -229,7 +240,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -238,9 +248,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -330,7 +347,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DCHROME_PNG_WRITE_SUPPORT' \
@@ -354,7 +381,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -363,9 +389,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -441,6 +474,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp \
ui_gl_gl_gyp \
webkit_glue_glue_gyp
@@ -449,7 +483,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_gpu.target.darwin-arm.mk b/content/content_gpu.target.darwin-arm.mk
index 81894c0..816a34a 100644
--- a/content/content_gpu.target.darwin-arm.mk
+++ b/content/content_gpu.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -84,7 +85,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -100,18 +111,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -184,7 +201,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -201,18 +228,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -279,13 +312,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_gpu.target.darwin-mips.mk b/content/content_gpu.target.darwin-mips.mk
index 7f6c4e0..89e94ca 100644
--- a/content/content_gpu.target.darwin-mips.mk
+++ b/content/content_gpu.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -83,7 +84,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -99,18 +110,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -182,7 +199,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -199,18 +226,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -273,13 +306,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_gpu.target.darwin-x86.mk b/content/content_gpu.target.darwin-x86.mk
index 2a1e7fd..c49b189 100644
--- a/content/content_gpu.target.darwin-x86.mk
+++ b/content/content_gpu.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -86,7 +87,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -102,18 +113,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -189,7 +206,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -206,18 +233,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -279,13 +312,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_gpu.target.linux-arm.mk b/content/content_gpu.target.linux-arm.mk
index 81894c0..816a34a 100644
--- a/content/content_gpu.target.linux-arm.mk
+++ b/content/content_gpu.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -84,7 +85,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -100,18 +111,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -184,7 +201,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -201,18 +228,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -279,13 +312,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_gpu.target.linux-mips.mk b/content/content_gpu.target.linux-mips.mk
index 7f6c4e0..89e94ca 100644
--- a/content/content_gpu.target.linux-mips.mk
+++ b/content/content_gpu.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -83,7 +84,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -99,18 +110,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -182,7 +199,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -199,18 +226,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -273,13 +306,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_gpu.target.linux-x86.mk b/content/content_gpu.target.linux-x86.mk
index 2a1e7fd..c49b189 100644
--- a/content/content_gpu.target.linux-x86.mk
+++ b/content/content_gpu.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -86,7 +87,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -102,18 +113,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -189,7 +206,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -206,18 +233,24 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -279,13 +312,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_renderer.target.darwin-arm.mk b/content/content_renderer.target.darwin-arm.mk
index a58b20f..4ca7380 100644
--- a/content/content_renderer.target.darwin-arm.mk
+++ b/content/content_renderer.target.darwin-arm.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,jingle_jingle_glue_gyp)/jingle_glue.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
@@ -247,7 +248,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -279,9 +290,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -290,9 +300,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -391,7 +408,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -424,9 +451,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -435,9 +461,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -530,6 +563,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
webkit_child_webkit_child_gyp \
webkit_glue_glue_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp
@@ -538,7 +572,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_renderer.target.darwin-mips.mk b/content/content_renderer.target.darwin-mips.mk
index 8a497b3..f56efda 100644
--- a/content/content_renderer.target.darwin-mips.mk
+++ b/content/content_renderer.target.darwin-mips.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,jingle_jingle_glue_gyp)/jingle_glue.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
@@ -246,7 +247,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -278,9 +289,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -289,9 +299,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -389,7 +406,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -422,9 +449,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -433,9 +459,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -524,6 +557,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
webkit_child_webkit_child_gyp \
webkit_glue_glue_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp
@@ -532,7 +566,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_renderer.target.darwin-x86.mk b/content/content_renderer.target.darwin-x86.mk
index c827af5..60193e8 100644
--- a/content/content_renderer.target.darwin-x86.mk
+++ b/content/content_renderer.target.darwin-x86.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,jingle_jingle_glue_gyp)/jingle_glue.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
@@ -248,7 +249,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -280,9 +291,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -291,9 +301,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -394,7 +411,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -427,9 +454,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -438,9 +464,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -528,6 +561,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
webkit_child_webkit_child_gyp \
webkit_glue_glue_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp
@@ -536,7 +570,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_renderer.target.linux-arm.mk b/content/content_renderer.target.linux-arm.mk
index a58b20f..4ca7380 100644
--- a/content/content_renderer.target.linux-arm.mk
+++ b/content/content_renderer.target.linux-arm.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,jingle_jingle_glue_gyp)/jingle_glue.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
@@ -247,7 +248,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -279,9 +290,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -290,9 +300,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -391,7 +408,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -424,9 +451,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -435,9 +461,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -530,6 +563,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
webkit_child_webkit_child_gyp \
webkit_glue_glue_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp
@@ -538,7 +572,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_renderer.target.linux-mips.mk b/content/content_renderer.target.linux-mips.mk
index 8a497b3..f56efda 100644
--- a/content/content_renderer.target.linux-mips.mk
+++ b/content/content_renderer.target.linux-mips.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,jingle_jingle_glue_gyp)/jingle_glue.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
@@ -246,7 +247,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -278,9 +289,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -289,9 +299,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -389,7 +406,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -422,9 +449,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -433,9 +459,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -524,6 +557,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
webkit_child_webkit_child_gyp \
webkit_glue_glue_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp
@@ -532,7 +566,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_renderer.target.linux-x86.mk b/content/content_renderer.target.linux-x86.mk
index c827af5..60193e8 100644
--- a/content/content_renderer.target.linux-x86.mk
+++ b/content/content_renderer.target.linux-x86.mk
@@ -14,6 +14,7 @@
$(call intermediates-dir-for,GYP,content_content_resources_gyp)/content_resources.stamp \
$(call intermediates-dir-for,GYP,jingle_jingle_glue_gyp)/jingle_glue.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
@@ -248,7 +249,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -280,9 +291,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -291,9 +301,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -394,7 +411,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -427,9 +454,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir) \
@@ -438,9 +464,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(gyp_shared_intermediate_dir)/content \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/libpng \
@@ -528,6 +561,7 @@
LOCAL_STATIC_LIBRARIES := \
cpufeatures \
+ skia_skia_library_gyp \
webkit_child_webkit_child_gyp \
webkit_glue_glue_gyp \
third_party_libphonenumber_libphonenumber_without_metadata_gyp
@@ -536,7 +570,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/content/content_utility.target.darwin-arm.mk b/content/content_utility.target.darwin-arm.mk
index cb4cba4..b2c6885 100644
--- a/content/content_utility.target.darwin-arm.mk
+++ b/content/content_utility.target.darwin-arm.mk
@@ -95,9 +95,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -187,9 +186,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
diff --git a/content/content_utility.target.darwin-mips.mk b/content/content_utility.target.darwin-mips.mk
index 3ea18ad..e6c82a6 100644
--- a/content/content_utility.target.darwin-mips.mk
+++ b/content/content_utility.target.darwin-mips.mk
@@ -94,9 +94,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -185,9 +184,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
diff --git a/content/content_utility.target.darwin-x86.mk b/content/content_utility.target.darwin-x86.mk
index 94187f0..38fcd63 100644
--- a/content/content_utility.target.darwin-x86.mk
+++ b/content/content_utility.target.darwin-x86.mk
@@ -97,9 +97,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -192,9 +191,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
diff --git a/content/content_utility.target.linux-arm.mk b/content/content_utility.target.linux-arm.mk
index cb4cba4..b2c6885 100644
--- a/content/content_utility.target.linux-arm.mk
+++ b/content/content_utility.target.linux-arm.mk
@@ -95,9 +95,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -187,9 +186,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
diff --git a/content/content_utility.target.linux-mips.mk b/content/content_utility.target.linux-mips.mk
index 3ea18ad..e6c82a6 100644
--- a/content/content_utility.target.linux-mips.mk
+++ b/content/content_utility.target.linux-mips.mk
@@ -94,9 +94,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -185,9 +184,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
diff --git a/content/content_utility.target.linux-x86.mk b/content/content_utility.target.linux-x86.mk
index 94187f0..38fcd63 100644
--- a/content/content_utility.target.linux-x86.mk
+++ b/content/content_utility.target.linux-x86.mk
@@ -97,9 +97,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
@@ -192,9 +191,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
diff --git a/gpu/command_buffer_service.target.darwin-arm.mk b/gpu/command_buffer_service.target.darwin-arm.mk
index adba9e6..6ac41fd 100644
--- a/gpu/command_buffer_service.target.darwin-arm.mk
+++ b/gpu/command_buffer_service.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,gpu_disk_cache_proto_gyp)/gpu_disk_cache_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp
@@ -128,7 +129,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -149,7 +160,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -158,9 +168,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -237,7 +254,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -259,7 +286,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -268,9 +294,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -343,6 +376,7 @@
LOCAL_STATIC_LIBRARIES := \
gpu_disk_cache_proto_gyp \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -350,7 +384,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/command_buffer_service.target.darwin-mips.mk b/gpu/command_buffer_service.target.darwin-mips.mk
index 8c3bbec..3f09268 100644
--- a/gpu/command_buffer_service.target.darwin-mips.mk
+++ b/gpu/command_buffer_service.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,gpu_disk_cache_proto_gyp)/gpu_disk_cache_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp
@@ -127,7 +128,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -148,7 +159,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -157,9 +167,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -235,7 +252,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -257,7 +284,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -266,9 +292,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -337,6 +370,7 @@
LOCAL_STATIC_LIBRARIES := \
gpu_disk_cache_proto_gyp \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -344,7 +378,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/command_buffer_service.target.darwin-x86.mk b/gpu/command_buffer_service.target.darwin-x86.mk
index 40101ac..d366c5a 100644
--- a/gpu/command_buffer_service.target.darwin-x86.mk
+++ b/gpu/command_buffer_service.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,gpu_disk_cache_proto_gyp)/gpu_disk_cache_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp
@@ -130,7 +131,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPROTOBUF_USE_DLLS' \
@@ -150,7 +161,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -159,9 +169,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -241,7 +258,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPROTOBUF_USE_DLLS' \
@@ -262,7 +289,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -271,9 +297,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -341,6 +374,7 @@
LOCAL_STATIC_LIBRARIES := \
gpu_disk_cache_proto_gyp \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -348,7 +382,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/command_buffer_service.target.linux-arm.mk b/gpu/command_buffer_service.target.linux-arm.mk
index adba9e6..6ac41fd 100644
--- a/gpu/command_buffer_service.target.linux-arm.mk
+++ b/gpu/command_buffer_service.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,gpu_disk_cache_proto_gyp)/gpu_disk_cache_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp
@@ -128,7 +129,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -149,7 +160,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -158,9 +168,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -237,7 +254,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -259,7 +286,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -268,9 +294,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -343,6 +376,7 @@
LOCAL_STATIC_LIBRARIES := \
gpu_disk_cache_proto_gyp \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -350,7 +384,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/command_buffer_service.target.linux-mips.mk b/gpu/command_buffer_service.target.linux-mips.mk
index 8c3bbec..3f09268 100644
--- a/gpu/command_buffer_service.target.linux-mips.mk
+++ b/gpu/command_buffer_service.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,gpu_disk_cache_proto_gyp)/gpu_disk_cache_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp
@@ -127,7 +128,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -148,7 +159,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -157,9 +167,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -235,7 +252,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -257,7 +284,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -266,9 +292,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -337,6 +370,7 @@
LOCAL_STATIC_LIBRARIES := \
gpu_disk_cache_proto_gyp \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -344,7 +378,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/command_buffer_service.target.linux-x86.mk b/gpu/command_buffer_service.target.linux-x86.mk
index 40101ac..d366c5a 100644
--- a/gpu/command_buffer_service.target.linux-x86.mk
+++ b/gpu/command_buffer_service.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,STATIC_LIBRARIES,gpu_disk_cache_proto_gyp)/gpu_disk_cache_proto_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp
@@ -130,7 +131,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPROTOBUF_USE_DLLS' \
@@ -150,7 +161,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -159,9 +169,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -241,7 +258,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPROTOBUF_USE_DLLS' \
@@ -262,7 +289,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -271,9 +297,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/protoc_out \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -341,6 +374,7 @@
LOCAL_STATIC_LIBRARIES := \
gpu_disk_cache_proto_gyp \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -348,7 +382,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/gles2_c_lib.target.darwin-arm.mk b/gpu/gles2_c_lib.target.darwin-arm.mk
index 7eb35c2..cbbffba 100644
--- a/gpu/gles2_c_lib.target.darwin-arm.mk
+++ b/gpu/gles2_c_lib.target.darwin-arm.mk
@@ -92,9 +92,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -183,9 +182,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
diff --git a/gpu/gles2_c_lib.target.darwin-mips.mk b/gpu/gles2_c_lib.target.darwin-mips.mk
index 37856bf..4f468a5 100644
--- a/gpu/gles2_c_lib.target.darwin-mips.mk
+++ b/gpu/gles2_c_lib.target.darwin-mips.mk
@@ -91,9 +91,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -181,9 +180,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
diff --git a/gpu/gles2_c_lib.target.darwin-x86.mk b/gpu/gles2_c_lib.target.darwin-x86.mk
index 56fb386..d599a33 100644
--- a/gpu/gles2_c_lib.target.darwin-x86.mk
+++ b/gpu/gles2_c_lib.target.darwin-x86.mk
@@ -94,9 +94,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -188,9 +187,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
diff --git a/gpu/gles2_c_lib.target.linux-arm.mk b/gpu/gles2_c_lib.target.linux-arm.mk
index 7eb35c2..cbbffba 100644
--- a/gpu/gles2_c_lib.target.linux-arm.mk
+++ b/gpu/gles2_c_lib.target.linux-arm.mk
@@ -92,9 +92,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -183,9 +182,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
diff --git a/gpu/gles2_c_lib.target.linux-mips.mk b/gpu/gles2_c_lib.target.linux-mips.mk
index 37856bf..4f468a5 100644
--- a/gpu/gles2_c_lib.target.linux-mips.mk
+++ b/gpu/gles2_c_lib.target.linux-mips.mk
@@ -91,9 +91,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -181,9 +180,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
diff --git a/gpu/gles2_c_lib.target.linux-x86.mk b/gpu/gles2_c_lib.target.linux-x86.mk
index 56fb386..d599a33 100644
--- a/gpu/gles2_c_lib.target.linux-x86.mk
+++ b/gpu/gles2_c_lib.target.linux-x86.mk
@@ -94,9 +94,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -188,9 +187,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
diff --git a/gpu/gles2_implementation.target.darwin-arm.mk b/gpu/gles2_implementation.target.darwin-arm.mk
index 60fd887..9bc77d0 100644
--- a/gpu/gles2_implementation.target.darwin-arm.mk
+++ b/gpu/gles2_implementation.target.darwin-arm.mk
@@ -12,7 +12,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -90,7 +91,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -106,9 +117,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -116,9 +126,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -192,7 +209,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -209,9 +236,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -219,9 +245,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -288,13 +321,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_gl_gl_gyp
+ ui_gl_gl_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/gles2_implementation.target.darwin-mips.mk b/gpu/gles2_implementation.target.darwin-mips.mk
index e56fabe..0d1559b 100644
--- a/gpu/gles2_implementation.target.darwin-mips.mk
+++ b/gpu/gles2_implementation.target.darwin-mips.mk
@@ -12,7 +12,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -89,7 +90,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -105,9 +116,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -115,9 +125,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -207,9 +234,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -217,9 +243,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -282,13 +315,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_gl_gl_gyp
+ ui_gl_gl_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/gles2_implementation.target.darwin-x86.mk b/gpu/gles2_implementation.target.darwin-x86.mk
index c37b514..8dda2db 100644
--- a/gpu/gles2_implementation.target.darwin-x86.mk
+++ b/gpu/gles2_implementation.target.darwin-x86.mk
@@ -12,7 +12,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -92,7 +93,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -108,9 +119,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -118,9 +128,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -197,7 +214,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -214,9 +241,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -224,9 +250,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -288,13 +321,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_gl_gl_gyp
+ ui_gl_gl_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/gles2_implementation.target.linux-arm.mk b/gpu/gles2_implementation.target.linux-arm.mk
index 60fd887..9bc77d0 100644
--- a/gpu/gles2_implementation.target.linux-arm.mk
+++ b/gpu/gles2_implementation.target.linux-arm.mk
@@ -12,7 +12,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -90,7 +91,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -106,9 +117,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -116,9 +126,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -192,7 +209,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -209,9 +236,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -219,9 +245,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -288,13 +321,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_gl_gl_gyp
+ ui_gl_gl_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/gles2_implementation.target.linux-mips.mk b/gpu/gles2_implementation.target.linux-mips.mk
index e56fabe..0d1559b 100644
--- a/gpu/gles2_implementation.target.linux-mips.mk
+++ b/gpu/gles2_implementation.target.linux-mips.mk
@@ -12,7 +12,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -89,7 +90,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -105,9 +116,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -115,9 +125,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -207,9 +234,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -217,9 +243,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -282,13 +315,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_gl_gl_gyp
+ ui_gl_gl_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/gles2_implementation.target.linux-x86.mk b/gpu/gles2_implementation.target.linux-x86.mk
index c37b514..8dda2db 100644
--- a/gpu/gles2_implementation.target.linux-x86.mk
+++ b/gpu/gles2_implementation.target.linux-x86.mk
@@ -12,7 +12,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_khronos_khronos_headers_gyp)/khronos_headers.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -92,7 +93,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -108,9 +119,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -118,9 +128,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -197,7 +214,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGLES2_IMPL_IMPLEMENTATION' \
'-DMESA_EGL_NO_X11_HEADERS' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -214,9 +241,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
@@ -224,9 +250,16 @@
$(LOCAL_PATH)/skia/config \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -288,13 +321,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- ui_gl_gl_gyp
+ ui_gl_gl_gyp \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/gpu.target.darwin-arm.mk b/gpu/gpu.target.darwin-arm.mk
index f4223ab..df78c6c 100644
--- a/gpu/gpu.target.darwin-arm.mk
+++ b/gpu/gpu.target.darwin-arm.mk
@@ -95,7 +95,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -185,7 +184,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/gpu/gpu.target.darwin-mips.mk b/gpu/gpu.target.darwin-mips.mk
index 71d0707..1ed0785 100644
--- a/gpu/gpu.target.darwin-mips.mk
+++ b/gpu/gpu.target.darwin-mips.mk
@@ -94,7 +94,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -183,7 +182,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/gpu/gpu.target.darwin-x86.mk b/gpu/gpu.target.darwin-x86.mk
index d85c23c..64a83e8 100644
--- a/gpu/gpu.target.darwin-x86.mk
+++ b/gpu/gpu.target.darwin-x86.mk
@@ -97,7 +97,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -190,7 +189,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/gpu/gpu.target.linux-arm.mk b/gpu/gpu.target.linux-arm.mk
index f4223ab..df78c6c 100644
--- a/gpu/gpu.target.linux-arm.mk
+++ b/gpu/gpu.target.linux-arm.mk
@@ -95,7 +95,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -185,7 +184,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/gpu/gpu.target.linux-mips.mk b/gpu/gpu.target.linux-mips.mk
index 71d0707..1ed0785 100644
--- a/gpu/gpu.target.linux-mips.mk
+++ b/gpu/gpu.target.linux-mips.mk
@@ -94,7 +94,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -183,7 +182,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/gpu/gpu.target.linux-x86.mk b/gpu/gpu.target.linux-x86.mk
index d85c23c..64a83e8 100644
--- a/gpu/gpu.target.linux-x86.mk
+++ b/gpu/gpu.target.linux-x86.mk
@@ -97,7 +97,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -190,7 +189,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/gpu/gpu_config.target.darwin-arm.mk b/gpu/gpu_config.target.darwin-arm.mk
index e32bd67..ed69123 100644
--- a/gpu/gpu_config.target.darwin-arm.mk
+++ b/gpu/gpu_config.target.darwin-arm.mk
@@ -104,9 +104,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
@@ -199,9 +198,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/gpu/gpu_config.target.darwin-mips.mk b/gpu/gpu_config.target.darwin-mips.mk
index 4db02f9..49e9ba4 100644
--- a/gpu/gpu_config.target.darwin-mips.mk
+++ b/gpu/gpu_config.target.darwin-mips.mk
@@ -103,9 +103,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
@@ -197,9 +196,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/gpu/gpu_config.target.darwin-x86.mk b/gpu/gpu_config.target.darwin-x86.mk
index 4954b52..592e09e 100644
--- a/gpu/gpu_config.target.darwin-x86.mk
+++ b/gpu/gpu_config.target.darwin-x86.mk
@@ -106,9 +106,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
@@ -204,9 +203,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/gpu/gpu_config.target.linux-arm.mk b/gpu/gpu_config.target.linux-arm.mk
index e32bd67..ed69123 100644
--- a/gpu/gpu_config.target.linux-arm.mk
+++ b/gpu/gpu_config.target.linux-arm.mk
@@ -104,9 +104,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
@@ -199,9 +198,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/gpu/gpu_config.target.linux-mips.mk b/gpu/gpu_config.target.linux-mips.mk
index 4db02f9..49e9ba4 100644
--- a/gpu/gpu_config.target.linux-mips.mk
+++ b/gpu/gpu_config.target.linux-mips.mk
@@ -103,9 +103,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
@@ -197,9 +196,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/gpu/gpu_config.target.linux-x86.mk b/gpu/gpu_config.target.linux-x86.mk
index 4954b52..592e09e 100644
--- a/gpu/gpu_config.target.linux-x86.mk
+++ b/gpu/gpu_config.target.linux-x86.mk
@@ -106,9 +106,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
@@ -204,9 +203,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk
index aadcaf4..6790725 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -92,17 +103,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -171,7 +188,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -187,17 +214,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -261,13 +294,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk
index f535647..08e6dd0 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -91,17 +102,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -169,7 +186,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -185,17 +212,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -255,13 +288,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk
index 73418b7..9b7e0aa 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.darwin-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -94,17 +105,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -176,7 +193,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -192,17 +219,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -261,13 +294,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk
index aadcaf4..6790725 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -92,17 +103,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -171,7 +188,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -187,17 +214,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -261,13 +294,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk
index f535647..08e6dd0 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -91,17 +102,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -169,7 +186,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -185,17 +212,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -255,13 +288,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk
index 73418b7..9b7e0aa 100644
--- a/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk
+++ b/gpu/skia_bindings/gpu_skia_bindings.target.linux-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -94,17 +105,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -176,7 +193,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -192,17 +219,23 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -261,13 +294,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/media/media.target.darwin-arm.mk b/media/media.target.darwin-arm.mk
index 5375ca2..404cfc9 100644
--- a/media/media.target.darwin-arm.mk
+++ b/media/media.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \
$(call intermediates-dir-for,GYP,media_video_capture_android_jni_headers_gyp)/video_capture_android_jni_headers.stamp
@@ -241,7 +242,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -257,7 +268,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -266,9 +276,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -343,7 +360,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -360,7 +387,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -369,9 +395,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -438,13 +471,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/media/media.target.darwin-mips.mk b/media/media.target.darwin-mips.mk
index 20e808b..2bb0b89 100644
--- a/media/media.target.darwin-mips.mk
+++ b/media/media.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \
$(call intermediates-dir-for,GYP,media_video_capture_android_jni_headers_gyp)/video_capture_android_jni_headers.stamp
@@ -240,7 +241,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -256,7 +267,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -265,9 +275,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -341,7 +358,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -358,7 +385,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -367,9 +393,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -432,13 +465,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/media/media.target.darwin-x86.mk b/media/media.target.darwin-x86.mk
index 79c2329..a33840b 100644
--- a/media/media.target.darwin-x86.mk
+++ b/media/media.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \
$(call intermediates-dir-for,GYP,media_video_capture_android_jni_headers_gyp)/video_capture_android_jni_headers.stamp
@@ -243,7 +244,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -259,7 +270,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -268,9 +278,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -347,7 +364,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -364,7 +391,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -373,9 +399,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -437,13 +470,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/media/media.target.linux-arm.mk b/media/media.target.linux-arm.mk
index 5375ca2..404cfc9 100644
--- a/media/media.target.linux-arm.mk
+++ b/media/media.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \
$(call intermediates-dir-for,GYP,media_video_capture_android_jni_headers_gyp)/video_capture_android_jni_headers.stamp
@@ -241,7 +242,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -257,7 +268,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -266,9 +276,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -343,7 +360,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -360,7 +387,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -369,9 +395,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -438,13 +471,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/media/media.target.linux-mips.mk b/media/media.target.linux-mips.mk
index 20e808b..2bb0b89 100644
--- a/media/media.target.linux-mips.mk
+++ b/media/media.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \
$(call intermediates-dir-for,GYP,media_video_capture_android_jni_headers_gyp)/video_capture_android_jni_headers.stamp
@@ -240,7 +241,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -256,7 +267,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -265,9 +275,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -341,7 +358,17 @@
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -358,7 +385,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -367,9 +393,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -432,13 +465,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/media/media.target.linux-x86.mk b/media/media.target.linux-x86.mk
index 79c2329..a33840b 100644
--- a/media/media.target.linux-x86.mk
+++ b/media/media.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,media_media_android_jni_headers_gyp)/media_android_jni_headers.stamp \
$(call intermediates-dir-for,GYP,media_video_capture_android_jni_headers_gyp)/video_capture_android_jni_headers.stamp
@@ -243,7 +244,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -259,7 +270,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -268,9 +278,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -347,7 +364,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DMEDIA_IMPLEMENTATION' \
'-DDISABLE_USER_INPUT_MONITOR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -364,7 +391,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -373,9 +399,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/opus/src/include \
$(PWD)/external/icu4c/common \
@@ -437,13 +470,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/media/player_android.target.darwin-arm.mk b/media/player_android.target.darwin-arm.mk
index 49d8519..7b20968 100644
--- a/media/player_android.target.darwin-arm.mk
+++ b/media/player_android.target.darwin-arm.mk
@@ -105,9 +105,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
@@ -201,9 +200,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/media/player_android.target.darwin-mips.mk b/media/player_android.target.darwin-mips.mk
index 7178181..3ec20c7 100644
--- a/media/player_android.target.darwin-mips.mk
+++ b/media/player_android.target.darwin-mips.mk
@@ -104,9 +104,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
@@ -199,9 +198,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/media/player_android.target.darwin-x86.mk b/media/player_android.target.darwin-x86.mk
index a9262f9..c3dc89d 100644
--- a/media/player_android.target.darwin-x86.mk
+++ b/media/player_android.target.darwin-x86.mk
@@ -107,9 +107,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
@@ -206,9 +205,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/media/player_android.target.linux-arm.mk b/media/player_android.target.linux-arm.mk
index 49d8519..7b20968 100644
--- a/media/player_android.target.linux-arm.mk
+++ b/media/player_android.target.linux-arm.mk
@@ -105,9 +105,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
@@ -201,9 +200,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/media/player_android.target.linux-mips.mk b/media/player_android.target.linux-mips.mk
index 7178181..3ec20c7 100644
--- a/media/player_android.target.linux-mips.mk
+++ b/media/player_android.target.linux-mips.mk
@@ -104,9 +104,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
@@ -199,9 +198,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/media/player_android.target.linux-x86.mk b/media/player_android.target.linux-x86.mk
index a9262f9..c3dc89d 100644
--- a/media/player_android.target.linux-x86.mk
+++ b/media/player_android.target.linux-x86.mk
@@ -107,9 +107,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
@@ -206,9 +205,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/media \
$(LOCAL_PATH)/third_party/khronos \
diff --git a/printing/printing.target.darwin-arm.mk b/printing/printing.target.darwin-arm.mk
index fd2e697..ef363e3 100644
--- a/printing/printing.target.darwin-arm.mk
+++ b/printing/printing.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,printing_printing_jni_headers_gyp)/printing_jni_headers.stamp
@@ -101,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -117,16 +128,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -198,7 +215,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -215,16 +242,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -290,13 +323,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/printing/printing.target.darwin-mips.mk b/printing/printing.target.darwin-mips.mk
index 8335eae..d4577a5 100644
--- a/printing/printing.target.darwin-mips.mk
+++ b/printing/printing.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,printing_printing_jni_headers_gyp)/printing_jni_headers.stamp
@@ -100,7 +101,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -116,16 +127,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -196,7 +213,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -213,16 +240,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/printing/printing.target.darwin-x86.mk b/printing/printing.target.darwin-x86.mk
index c6cc3c3..327c0f2 100644
--- a/printing/printing.target.darwin-x86.mk
+++ b/printing/printing.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,printing_printing_jni_headers_gyp)/printing_jni_headers.stamp
@@ -103,7 +104,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -119,16 +130,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -203,7 +220,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -220,16 +247,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -290,13 +323,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/printing/printing.target.linux-arm.mk b/printing/printing.target.linux-arm.mk
index fd2e697..ef363e3 100644
--- a/printing/printing.target.linux-arm.mk
+++ b/printing/printing.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,printing_printing_jni_headers_gyp)/printing_jni_headers.stamp
@@ -101,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -117,16 +128,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -198,7 +215,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -215,16 +242,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -290,13 +323,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/printing/printing.target.linux-mips.mk b/printing/printing.target.linux-mips.mk
index 8335eae..d4577a5 100644
--- a/printing/printing.target.linux-mips.mk
+++ b/printing/printing.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,printing_printing_jni_headers_gyp)/printing_jni_headers.stamp
@@ -100,7 +101,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -116,16 +127,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -196,7 +213,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -213,16 +240,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/printing/printing.target.linux-x86.mk b/printing/printing.target.linux-x86.mk
index c6cc3c3..327c0f2 100644
--- a/printing/printing.target.linux-x86.mk
+++ b/printing/printing.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,printing_printing_jni_headers_gyp)/printing_jni_headers.stamp
@@ -103,7 +104,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -119,16 +130,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -203,7 +220,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DPRINTING_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -220,16 +247,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(gyp_shared_intermediate_dir)/printing \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -290,13 +323,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/skia/skia.target.darwin-arm.mk b/skia/skia.target.darwin-arm.mk
index de4f04f..96515a8 100644
--- a/skia/skia.target.darwin-arm.mk
+++ b/skia/skia.target.darwin-arm.mk
@@ -12,7 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a
GYP_GENERATED_OUTPUTS :=
diff --git a/skia/skia.target.darwin-mips.mk b/skia/skia.target.darwin-mips.mk
index de4f04f..96515a8 100644
--- a/skia/skia.target.darwin-mips.mk
+++ b/skia/skia.target.darwin-mips.mk
@@ -12,7 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a
GYP_GENERATED_OUTPUTS :=
diff --git a/skia/skia.target.darwin-x86.mk b/skia/skia.target.darwin-x86.mk
index de4f04f..96515a8 100644
--- a/skia/skia.target.darwin-x86.mk
+++ b/skia/skia.target.darwin-x86.mk
@@ -12,7 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a
GYP_GENERATED_OUTPUTS :=
diff --git a/skia/skia.target.linux-arm.mk b/skia/skia.target.linux-arm.mk
index de4f04f..96515a8 100644
--- a/skia/skia.target.linux-arm.mk
+++ b/skia/skia.target.linux-arm.mk
@@ -12,7 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a
GYP_GENERATED_OUTPUTS :=
diff --git a/skia/skia.target.linux-mips.mk b/skia/skia.target.linux-mips.mk
index de4f04f..96515a8 100644
--- a/skia/skia.target.linux-mips.mk
+++ b/skia/skia.target.linux-mips.mk
@@ -12,7 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a
GYP_GENERATED_OUTPUTS :=
diff --git a/skia/skia.target.linux-x86.mk b/skia/skia.target.linux-x86.mk
index de4f04f..96515a8 100644
--- a/skia/skia.target.linux-x86.mk
+++ b/skia/skia.target.linux-x86.mk
@@ -12,7 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a
GYP_GENERATED_OUTPUTS :=
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index 6530a62..66e9993 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -11,7 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -102,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -116,12 +126,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -194,7 +211,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -208,12 +235,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -277,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/skia/skia_chrome.target.darwin-mips.mk b/skia/skia_chrome.target.darwin-mips.mk
index 055e09d..ea31cd8 100644
--- a/skia/skia_chrome.target.darwin-mips.mk
+++ b/skia/skia_chrome.target.darwin-mips.mk
@@ -11,7 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -102,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -116,12 +126,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -194,7 +211,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -208,12 +235,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -273,13 +307,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/skia/skia_chrome.target.darwin-x86.mk b/skia/skia_chrome.target.darwin-x86.mk
index 400a509..ac550cb 100644
--- a/skia/skia_chrome.target.darwin-x86.mk
+++ b/skia/skia_chrome.target.darwin-x86.mk
@@ -11,7 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -104,7 +104,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -118,12 +128,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -199,7 +216,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -213,12 +240,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -277,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/skia/skia_chrome.target.linux-arm.mk b/skia/skia_chrome.target.linux-arm.mk
index 6530a62..66e9993 100644
--- a/skia/skia_chrome.target.linux-arm.mk
+++ b/skia/skia_chrome.target.linux-arm.mk
@@ -11,7 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -102,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -116,12 +126,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -194,7 +211,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -208,12 +235,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -277,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/skia/skia_chrome.target.linux-mips.mk b/skia/skia_chrome.target.linux-mips.mk
index 055e09d..ea31cd8 100644
--- a/skia/skia_chrome.target.linux-mips.mk
+++ b/skia/skia_chrome.target.linux-mips.mk
@@ -11,7 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -102,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -116,12 +126,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -194,7 +211,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -208,12 +235,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -273,13 +307,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/skia/skia_chrome.target.linux-x86.mk b/skia/skia_chrome.target.linux-x86.mk
index 400a509..ac550cb 100644
--- a/skia/skia_chrome.target.linux-x86.mk
+++ b/skia/skia_chrome.target.linux-x86.mk
@@ -11,7 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_library_gyp)/skia_library.stamp
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -104,7 +104,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -118,12 +128,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -199,7 +216,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -213,12 +240,19 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
@@ -277,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/skia/skia_library.target.darwin-arm.mk b/skia/skia_library.target.darwin-arm.mk
index f40c8d6..4af50c7 100644
--- a/skia/skia_library.target.darwin-arm.mk
+++ b/skia/skia_library.target.darwin-arm.mk
@@ -2,631 +2,712 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := GYP
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := skia_skia_library_gyp
-LOCAL_MODULE_STEM := skia_library
-LOCAL_MODULE_SUFFIX := .stamp
+LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
gyp_intermediate_dir := $(call local-intermediates-dir)
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
+GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
-### Rules for action "generate_skia_library_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
- @echo "Gyp action: Generating skia_library shim headers ($@)"
- $(hide)cd $(gyp_local_path)/skia; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios; python ../tools/generate_shim_headers/generate_shim_headers.py --headers-root ../third_party/skia/include --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target" animator/SkAnimator.h animator/SkAnimatorView.h config/SkUserConfig.h core/Sk64.h core/SkAdvancedTypefaceMetrics.h core/SkAnnotation.h core/SkBitmap.h core/SkBitmapDevice.h core/SkBlitRow.h core/SkBounder.h core/SkCanvas.h core/SkChecksum.h core/SkChunkAlloc.h core/SkClipStack.h core/SkColor.h core/SkColorFilter.h core/SkColorPriv.h core/SkColorShader.h core/SkColorTable.h core/SkComposeShader.h core/SkData.h core/SkDataTable.h core/SkDeque.h core/SkDevice.h core/SkDeviceProperties.h core/SkDither.h core/SkDocument.h core/SkDraw.h core/SkDrawFilter.h core/SkDrawLooper.h core/SkEmptyShader.h core/SkEndian.h core/SkError.h core/SkFixed.h core/SkFlate.h core/SkFlattenable.h core/SkFlattenableBuffers.h core/SkFlattenableSerialization.h core/SkFloatBits.h core/SkFloatingPoint.h core/SkFontHost.h core/SkFontLCDConfig.h core/SkGeometry.h core/SkGraphics.h core/SkImage.h core/SkImageDecoder.h core/SkImageEncoder.h core/SkImageFilter.h core/SkImageFilterUtils.h core/SkImageGenerator.h core/SkImageInfo.h core/SkInstCnt.h core/SkLineClipper.h core/SkMallocPixelRef.h core/SkMask.h core/SkMaskFilter.h core/SkMath.h core/SkMatrix.h core/SkMetaData.h core/SkOSFile.h core/SkPackBits.h core/SkPaint.h core/SkPaintOptionsAndroid.h core/SkPath.h core/SkPathEffect.h core/SkPathMeasure.h core/SkPathRef.h core/SkPicture.h core/SkPixelRef.h core/SkPoint.h core/SkPostConfig.h core/SkPreConfig.h core/SkRRect.h core/SkRasterizer.h core/SkReader32.h core/SkRect.h core/SkRefCnt.h core/SkRegion.h core/SkScalar.h core/SkShader.h core/SkSize.h core/SkStream.h core/SkString.h core/SkStringUtils.h core/SkStrokeRec.h core/SkSurface.h core/SkTArray.h core/SkTDArray.h core/SkTDStack.h core/SkTDict.h core/SkTInternalLList.h core/SkTLazy.h core/SkTRegistry.h core/SkTSearch.h core/SkTemplates.h core/SkThread.h core/SkThread_platform.h core/SkTileGridPicture.h core/SkTime.h core/SkTrace.h core/SkTypeface.h core/SkTypes.h core/SkUnPreMultiply.h core/SkUnitMapper.h core/SkUtils.h core/SkWeakRefCnt.h core/SkWriter32.h core/SkXfermode.h device/xps/SkConstexprMath.h device/xps/SkXPSDevice.h effects/Sk1DPathEffect.h effects/Sk2DPathEffect.h effects/SkArithmeticMode.h effects/SkAvoidXfermode.h effects/SkBicubicImageFilter.h effects/SkBitmapAlphaThresholdShader.h effects/SkBitmapSource.h effects/SkBlurDrawLooper.h effects/SkBlurImageFilter.h effects/SkBlurMaskFilter.h effects/SkColorFilterImageFilter.h effects/SkColorMatrix.h effects/SkColorMatrixFilter.h effects/SkComposeImageFilter.h effects/SkCornerPathEffect.h effects/SkDashPathEffect.h effects/SkDiscretePathEffect.h effects/SkDisplacementMapEffect.h effects/SkDrawExtraPathEffect.h effects/SkDropShadowImageFilter.h effects/SkEmbossMaskFilter.h effects/SkGradientShader.h effects/SkKernel33MaskFilter.h effects/SkLayerDrawLooper.h effects/SkLayerRasterizer.h effects/SkLerpXfermode.h effects/SkLightingImageFilter.h effects/SkLumaColorFilter.h effects/SkMagnifierImageFilter.h effects/SkMatrixConvolutionImageFilter.h effects/SkMergeImageFilter.h effects/SkMorphologyImageFilter.h effects/SkOffsetImageFilter.h effects/SkPaintFlagsDrawFilter.h effects/SkPerlinNoiseShader.h effects/SkPictureImageFilter.h effects/SkPixelXorXfermode.h effects/SkPorterDuff.h effects/SkRectShaderImageFilter.h effects/SkStippleMaskFilter.h effects/SkTableColorFilter.h effects/SkTableMaskFilter.h effects/SkTestImageFilters.h effects/SkTileImageFilter.h effects/SkTransparentShader.h effects/SkXfermodeImageFilter.h gpu/GrBackendEffectFactory.h gpu/GrBitmapTextContext.h gpu/GrClipData.h gpu/GrColor.h gpu/GrConfig.h gpu/GrContext.h gpu/GrContextFactory.h gpu/GrCoordTransform.h gpu/GrDistanceFieldTextContext.h gpu/GrDrawEffect.h gpu/GrEffect.h gpu/GrEffectStage.h gpu/GrEffectUnitTest.h gpu/GrFontScaler.h gpu/GrGlyph.h gpu/GrKey.h gpu/GrPaint.h gpu/GrPathRendererChain.h gpu/GrPoint.h gpu/GrRect.h gpu/GrRenderTarget.h gpu/GrResource.h gpu/GrSurface.h gpu/GrTBackendEffectFactory.h gpu/GrTextContext.h gpu/GrTexture.h gpu/GrTextureAccess.h gpu/GrTypes.h gpu/GrTypesPriv.h gpu/GrUserConfig.h gpu/SkGpuDevice.h gpu/SkGr.h gpu/SkGrPixelRef.h gpu/SkGrTexturePixelRef.h gpu/gl/GrGLConfig.h gpu/gl/GrGLConfig_chrome.h gpu/gl/GrGLExtensions.h gpu/gl/GrGLFunctions.h gpu/gl/GrGLInterface.h gpu/gl/SkANGLEGLContext.h gpu/gl/SkDebugGLContext.h gpu/gl/SkGLContextHelper.h gpu/gl/SkMesaGLContext.h gpu/gl/SkNativeGLContext.h gpu/gl/SkNullGLContext.h images/SkForceLinking.h images/SkImageRef.h images/SkImageRef_GlobalPool.h images/SkImages.h images/SkMovie.h images/SkPageFlipper.h pathops/SkPathOps.h pdf/SkPDFDevice.h pdf/SkPDFDocument.h pipe/SkGPipe.h ports/SkFontConfigInterface.h ports/SkFontMgr.h ports/SkFontStyle.h ports/SkHarfBuzzFont.h ports/SkTypeface_android.h ports/SkTypeface_mac.h ports/SkTypeface_win.h svg/SkSVGAttribute.h svg/SkSVGBase.h svg/SkSVGPaintState.h svg/SkSVGParser.h svg/SkSVGTypes.h text/SkTextLayout.h utils/SkBoundaryPatch.h utils/SkCamera.h utils/SkCanvasStateUtils.h utils/SkCondVar.h utils/SkCountdown.h utils/SkCubicInterval.h utils/SkCullPoints.h utils/SkDebugUtils.h utils/SkDeferredCanvas.h utils/SkDumpCanvas.h utils/SkFrontBufferedStream.h utils/SkInterpolator.h utils/SkJSON.h utils/SkJSONCPP.h utils/SkLayer.h utils/SkLua.h utils/SkLuaCanvas.h utils/SkMatrix44.h utils/SkMeshUtils.h utils/SkNWayCanvas.h utils/SkNinePatch.h utils/SkNullCanvas.h utils/SkParse.h utils/SkParsePaint.h utils/SkParsePath.h utils/SkPathUtils.h utils/SkPictureUtils.h utils/SkProxyCanvas.h utils/SkRTConf.h utils/SkRandom.h utils/SkRunnable.h utils/SkThreadPool.h utils/SkUnitMappers.h utils/SkWGL.h utils/ios/SkStream_NSData.h utils/mac/SkCGUtils.h utils/win/SkAutoCoInitialize.h utils/win/SkHRESULT.h utils/win/SkIStream.h utils/win/SkTScopedComPtr.h views/SkApplication.h views/SkBGViewArtist.h views/SkEvent.h views/SkEventSink.h views/SkKey.h views/SkOSMenu.h views/SkOSWindow_Android.h views/SkOSWindow_Mac.h views/SkOSWindow_NaCl.h views/SkOSWindow_SDL.h views/SkOSWindow_Unix.h views/SkOSWindow_Win.h views/SkOSWindow_iOS.h views/SkStackViewLayout.h views/SkSystemEventTypes.h views/SkTextBox.h views/SkTouchGesture.h views/SkView.h views/SkViewInflate.h views/SkWidget.h views/SkWindow.h views/android/AndroidKeyToSkKey.h views/animated/SkBorderView.h views/animated/SkImageView.h views/animated/SkProgressBarView.h views/animated/SkScrollBarView.h views/animated/SkWidgetViews.h views/unix/XkeysToSkKeys.h views/unix/keysym2ucs.h xml/SkBML_WXMLParser.h xml/SkBML_XMLParser.h xml/SkDOM.h xml/SkJS.h xml/SkXMLParser.h xml/SkXMLWriter.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+ third_party/skia/src/core/SkFlate.cpp \
+ third_party/skia/src/core/SkPaintOptionsAndroid.cpp \
+ third_party/skia/src/ports/SkImageDecoder_empty.cpp \
+ third_party/skia/src/images/SkScaledBitmapSampler.cpp \
+ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \
+ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \
+ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \
+ third_party/skia/src/ports/SkFontConfigParser_android.cpp \
+ third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \
+ third_party/skia/src/ports/SkOSFile_posix.cpp \
+ third_party/skia/src/ports/SkOSFile_stdio.cpp \
+ third_party/skia/src/ports/SkThread_pthread.cpp \
+ third_party/skia/src/ports/SkTime_Unix.cpp \
+ third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
+ third_party/skia/src/sfnt/SkOTUtils.cpp \
+ third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
+ third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
+ third_party/skia/src/utils/debugger/SkObjectParser.cpp \
+ third_party/skia/src/utils/SkBase64.cpp \
+ third_party/skia/src/utils/SkBitSet.cpp \
+ third_party/skia/src/utils/SkCanvasStack.cpp \
+ third_party/skia/src/utils/SkCanvasStateUtils.cpp \
+ third_party/skia/src/utils/SkDeferredCanvas.cpp \
+ third_party/skia/src/utils/SkMatrix44.cpp \
+ third_party/skia/src/utils/SkNullCanvas.cpp \
+ third_party/skia/src/utils/SkNWayCanvas.cpp \
+ third_party/skia/src/utils/SkPictureUtils.cpp \
+ third_party/skia/src/utils/SkProxyCanvas.cpp \
+ third_party/skia/src/utils/SkRTConf.cpp \
+ third_party/skia/src/core/Sk64.cpp \
+ third_party/skia/src/core/SkAAClip.cpp \
+ third_party/skia/src/core/SkAnnotation.cpp \
+ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \
+ third_party/skia/src/core/SkAlphaRuns.cpp \
+ third_party/skia/src/core/SkBBoxRecord.cpp \
+ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
+ third_party/skia/src/core/SkBitmap.cpp \
+ third_party/skia/src/core/SkBitmapDevice.cpp \
+ third_party/skia/src/core/SkBitmapFilter.cpp \
+ third_party/skia/src/core/SkBitmapHeap.cpp \
+ third_party/skia/src/core/SkBitmapProcShader.cpp \
+ third_party/skia/src/core/SkBitmapProcState.cpp \
+ third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
+ third_party/skia/src/core/SkBitmapScaler.cpp \
+ third_party/skia/src/core/SkBitmap_scroll.cpp \
+ third_party/skia/src/core/SkBlitMask_D32.cpp \
+ third_party/skia/src/core/SkBlitRow_D16.cpp \
+ third_party/skia/src/core/SkBlitRow_D32.cpp \
+ third_party/skia/src/core/SkBlitter.cpp \
+ third_party/skia/src/core/SkBlitter_A8.cpp \
+ third_party/skia/src/core/SkBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkBlitter_Sprite.cpp \
+ third_party/skia/src/core/SkBuffer.cpp \
+ third_party/skia/src/core/SkCanvas.cpp \
+ third_party/skia/src/core/SkChunkAlloc.cpp \
+ third_party/skia/src/core/SkClipStack.cpp \
+ third_party/skia/src/core/SkColor.cpp \
+ third_party/skia/src/core/SkColorFilter.cpp \
+ third_party/skia/src/core/SkColorTable.cpp \
+ third_party/skia/src/core/SkComposeShader.cpp \
+ third_party/skia/src/core/SkConfig8888.cpp \
+ third_party/skia/src/core/SkConvolver.cpp \
+ third_party/skia/src/core/SkCordic.cpp \
+ third_party/skia/src/core/SkCubicClipper.cpp \
+ third_party/skia/src/core/SkData.cpp \
+ third_party/skia/src/core/SkDataTable.cpp \
+ third_party/skia/src/core/SkDebug.cpp \
+ third_party/skia/src/core/SkDeque.cpp \
+ third_party/skia/src/core/SkDevice.cpp \
+ third_party/skia/src/core/SkDeviceLooper.cpp \
+ third_party/skia/src/core/SkDeviceProfile.cpp \
+ third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \
+ third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \
+ third_party/skia/src/core/SkDither.cpp \
+ third_party/skia/src/core/SkDraw.cpp \
+ third_party/skia/src/core/SkDrawLooper.cpp \
+ third_party/skia/src/core/SkEdgeBuilder.cpp \
+ third_party/skia/src/core/SkEdgeClipper.cpp \
+ third_party/skia/src/core/SkEdge.cpp \
+ third_party/skia/src/core/SkError.cpp \
+ third_party/skia/src/core/SkFilterProc.cpp \
+ third_party/skia/src/core/SkFilterShader.cpp \
+ third_party/skia/src/core/SkFlattenable.cpp \
+ third_party/skia/src/core/SkFlattenableBuffers.cpp \
+ third_party/skia/src/core/SkFlattenableSerialization.cpp \
+ third_party/skia/src/core/SkFloat.cpp \
+ third_party/skia/src/core/SkFloatBits.cpp \
+ third_party/skia/src/core/SkFontHost.cpp \
+ third_party/skia/src/core/SkFontDescriptor.cpp \
+ third_party/skia/src/core/SkFontStream.cpp \
+ third_party/skia/src/core/SkGeometry.cpp \
+ third_party/skia/src/core/SkGlyphCache.cpp \
+ third_party/skia/src/core/SkGraphics.cpp \
+ third_party/skia/src/core/SkInstCnt.cpp \
+ third_party/skia/src/core/SkImageFilter.cpp \
+ third_party/skia/src/core/SkImageFilterUtils.cpp \
+ third_party/skia/src/core/SkImageInfo.cpp \
+ third_party/skia/src/core/SkLineClipper.cpp \
+ third_party/skia/src/core/SkMallocPixelRef.cpp \
+ third_party/skia/src/core/SkMask.cpp \
+ third_party/skia/src/core/SkMaskFilter.cpp \
+ third_party/skia/src/core/SkMaskGamma.cpp \
+ third_party/skia/src/core/SkMath.cpp \
+ third_party/skia/src/core/SkMatrix.cpp \
+ third_party/skia/src/core/SkMetaData.cpp \
+ third_party/skia/src/core/SkMipMap.cpp \
+ third_party/skia/src/core/SkOrderedReadBuffer.cpp \
+ third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
+ third_party/skia/src/core/SkPackBits.cpp \
+ third_party/skia/src/core/SkPaint.cpp \
+ third_party/skia/src/core/SkPaintPriv.cpp \
+ third_party/skia/src/core/SkPath.cpp \
+ third_party/skia/src/core/SkPathEffect.cpp \
+ third_party/skia/src/core/SkPathHeap.cpp \
+ third_party/skia/src/core/SkPathMeasure.cpp \
+ third_party/skia/src/core/SkPathRef.cpp \
+ third_party/skia/src/core/SkPicture.cpp \
+ third_party/skia/src/core/SkPictureFlat.cpp \
+ third_party/skia/src/core/SkPicturePlayback.cpp \
+ third_party/skia/src/core/SkPictureRecord.cpp \
+ third_party/skia/src/core/SkPictureStateTree.cpp \
+ third_party/skia/src/core/SkPixelRef.cpp \
+ third_party/skia/src/core/SkPoint.cpp \
+ third_party/skia/src/core/SkProcSpriteBlitter.cpp \
+ third_party/skia/src/core/SkPtrRecorder.cpp \
+ third_party/skia/src/core/SkQuadClipper.cpp \
+ third_party/skia/src/core/SkRasterClip.cpp \
+ third_party/skia/src/core/SkRasterizer.cpp \
+ third_party/skia/src/core/SkRect.cpp \
+ third_party/skia/src/core/SkRefDict.cpp \
+ third_party/skia/src/core/SkRegion.cpp \
+ third_party/skia/src/core/SkRegion_path.cpp \
+ third_party/skia/src/core/SkRRect.cpp \
+ third_party/skia/src/core/SkRTree.cpp \
+ third_party/skia/src/core/SkScaledImageCache.cpp \
+ third_party/skia/src/core/SkScalar.cpp \
+ third_party/skia/src/core/SkScalerContext.cpp \
+ third_party/skia/src/core/SkScan.cpp \
+ third_party/skia/src/core/SkScan_AntiPath.cpp \
+ third_party/skia/src/core/SkScan_Antihair.cpp \
+ third_party/skia/src/core/SkScan_Hairline.cpp \
+ third_party/skia/src/core/SkScan_Path.cpp \
+ third_party/skia/src/core/SkShader.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkStream.cpp \
+ third_party/skia/src/core/SkString.cpp \
+ third_party/skia/src/core/SkStringUtils.cpp \
+ third_party/skia/src/core/SkStroke.cpp \
+ third_party/skia/src/core/SkStrokeRec.cpp \
+ third_party/skia/src/core/SkStrokerPriv.cpp \
+ third_party/skia/src/core/SkTileGrid.cpp \
+ third_party/skia/src/core/SkTileGridPicture.cpp \
+ third_party/skia/src/core/SkTLS.cpp \
+ third_party/skia/src/core/SkTSearch.cpp \
+ third_party/skia/src/core/SkTypeface.cpp \
+ third_party/skia/src/core/SkTypefaceCache.cpp \
+ third_party/skia/src/core/SkUnPreMultiply.cpp \
+ third_party/skia/src/core/SkUtils.cpp \
+ third_party/skia/src/core/SkValidatingReadBuffer.cpp \
+ third_party/skia/src/core/SkWriter32.cpp \
+ third_party/skia/src/core/SkXfermode.cpp \
+ third_party/skia/src/doc/SkDocument.cpp \
+ third_party/skia/src/image/SkDataPixelRef.cpp \
+ third_party/skia/src/image/SkImage.cpp \
+ third_party/skia/src/image/SkImagePriv.cpp \
+ third_party/skia/src/image/SkImage_Codec.cpp \
+ third_party/skia/src/image/SkImage_Picture.cpp \
+ third_party/skia/src/image/SkImage_Raster.cpp \
+ third_party/skia/src/image/SkSurface.cpp \
+ third_party/skia/src/image/SkSurface_Picture.cpp \
+ third_party/skia/src/image/SkSurface_Raster.cpp \
+ third_party/skia/src/pipe/SkGPipeRead.cpp \
+ third_party/skia/src/pipe/SkGPipeWrite.cpp \
+ third_party/skia/src/lazy/SkCachingPixelRef.cpp \
+ third_party/skia/src/pathops/SkAddIntersections.cpp \
+ third_party/skia/src/pathops/SkDCubicIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicToQuads.cpp \
+ third_party/skia/src/pathops/SkDLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadImplicit.cpp \
+ third_party/skia/src/pathops/SkDQuadIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \
+ third_party/skia/src/pathops/SkIntersections.cpp \
+ third_party/skia/src/pathops/SkOpAngle.cpp \
+ third_party/skia/src/pathops/SkOpContour.cpp \
+ third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \
+ third_party/skia/src/pathops/SkOpSegment.cpp \
+ third_party/skia/src/pathops/SkPathOpsBounds.cpp \
+ third_party/skia/src/pathops/SkPathOpsCommon.cpp \
+ third_party/skia/src/pathops/SkPathOpsCubic.cpp \
+ third_party/skia/src/pathops/SkPathOpsDebug.cpp \
+ third_party/skia/src/pathops/SkPathOpsLine.cpp \
+ third_party/skia/src/pathops/SkPathOpsOp.cpp \
+ third_party/skia/src/pathops/SkPathOpsPoint.cpp \
+ third_party/skia/src/pathops/SkPathOpsQuad.cpp \
+ third_party/skia/src/pathops/SkPathOpsRect.cpp \
+ third_party/skia/src/pathops/SkPathOpsSimplify.cpp \
+ third_party/skia/src/pathops/SkPathOpsTriangle.cpp \
+ third_party/skia/src/pathops/SkPathOpsTypes.cpp \
+ third_party/skia/src/pathops/SkPathWriter.cpp \
+ third_party/skia/src/pathops/SkQuarticRoot.cpp \
+ third_party/skia/src/pathops/SkReduceOrder.cpp \
+ third_party/skia/src/effects/Sk1DPathEffect.cpp \
+ third_party/skia/src/effects/Sk2DPathEffect.cpp \
+ third_party/skia/src/effects/SkArithmeticMode.cpp \
+ third_party/skia/src/effects/SkAvoidXfermode.cpp \
+ third_party/skia/src/effects/SkBicubicImageFilter.cpp \
+ third_party/skia/src/effects/SkBitmapAlphaThresholdShader.cpp \
+ third_party/skia/src/effects/SkBitmapSource.cpp \
+ third_party/skia/src/effects/SkBlurDrawLooper.cpp \
+ third_party/skia/src/effects/SkBlurMask.cpp \
+ third_party/skia/src/effects/SkBlurImageFilter.cpp \
+ third_party/skia/src/effects/SkBlurMaskFilter.cpp \
+ third_party/skia/src/effects/SkColorFilters.cpp \
+ third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
+ third_party/skia/src/effects/SkColorMatrix.cpp \
+ third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
+ third_party/skia/src/effects/SkCornerPathEffect.cpp \
+ third_party/skia/src/effects/SkDashPathEffect.cpp \
+ third_party/skia/src/effects/SkDiscretePathEffect.cpp \
+ third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+ third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
+ third_party/skia/src/effects/SkEmbossMask.cpp \
+ third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+ third_party/skia/src/effects/SkGpuBlurUtils.cpp \
+ third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
+ third_party/skia/src/effects/SkLayerDrawLooper.cpp \
+ third_party/skia/src/effects/SkLayerRasterizer.cpp \
+ third_party/skia/src/effects/SkLerpXfermode.cpp \
+ third_party/skia/src/effects/SkLightingImageFilter.cpp \
+ third_party/skia/src/effects/SkLumaColorFilter.cpp \
+ third_party/skia/src/effects/SkMagnifierImageFilter.cpp \
+ third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \
+ third_party/skia/src/effects/SkMergeImageFilter.cpp \
+ third_party/skia/src/effects/SkMorphologyImageFilter.cpp \
+ third_party/skia/src/effects/SkOffsetImageFilter.cpp \
+ third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \
+ third_party/skia/src/effects/SkPerlinNoiseShader.cpp \
+ third_party/skia/src/effects/SkPictureImageFilter.cpp \
+ third_party/skia/src/effects/SkPixelXorXfermode.cpp \
+ third_party/skia/src/effects/SkPorterDuff.cpp \
+ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \
+ third_party/skia/src/effects/SkStippleMaskFilter.cpp \
+ third_party/skia/src/effects/SkTableColorFilter.cpp \
+ third_party/skia/src/effects/SkTableMaskFilter.cpp \
+ third_party/skia/src/effects/SkTestImageFilters.cpp \
+ third_party/skia/src/effects/SkTileImageFilter.cpp \
+ third_party/skia/src/effects/SkTransparentShader.cpp \
+ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \
+ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \
+ third_party/skia/src/effects/gradients/SkClampRange.cpp \
+ third_party/skia/src/effects/gradients/SkGradientShader.cpp \
+ third_party/skia/src/effects/gradients/SkLinearGradient.cpp \
+ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \
+ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \
+ third_party/skia/src/pdf/SkPDFCatalog.cpp \
+ third_party/skia/src/pdf/SkPDFDevice.cpp \
+ third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \
+ third_party/skia/src/pdf/SkPDFDocument.cpp \
+ third_party/skia/src/pdf/SkPDFFont.cpp \
+ third_party/skia/src/pdf/SkPDFFormXObject.cpp \
+ third_party/skia/src/pdf/SkPDFGraphicState.cpp \
+ third_party/skia/src/pdf/SkPDFImage.cpp \
+ third_party/skia/src/pdf/SkPDFPage.cpp \
+ third_party/skia/src/pdf/SkPDFResourceDict.cpp \
+ third_party/skia/src/pdf/SkPDFShader.cpp \
+ third_party/skia/src/pdf/SkPDFStream.cpp \
+ third_party/skia/src/pdf/SkPDFTypes.cpp \
+ third_party/skia/src/pdf/SkPDFUtils.cpp \
+ third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \
+ third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \
+ third_party/skia/src/gpu/GrAARectRenderer.cpp \
+ third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \
+ third_party/skia/src/gpu/GrAllocPool.cpp \
+ third_party/skia/src/gpu/GrAtlas.cpp \
+ third_party/skia/src/gpu/GrBitmapTextContext.cpp \
+ third_party/skia/src/gpu/GrBlend.cpp \
+ third_party/skia/src/gpu/GrBufferAllocPool.cpp \
+ third_party/skia/src/gpu/GrCacheID.cpp \
+ third_party/skia/src/gpu/GrClipData.cpp \
+ third_party/skia/src/gpu/GrContext.cpp \
+ third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \
+ third_party/skia/src/gpu/GrDrawState.cpp \
+ third_party/skia/src/gpu/GrDrawTarget.cpp \
+ third_party/skia/src/gpu/GrEffect.cpp \
+ third_party/skia/src/gpu/GrClipMaskCache.cpp \
+ third_party/skia/src/gpu/GrClipMaskManager.cpp \
+ third_party/skia/src/gpu/GrGpu.cpp \
+ third_party/skia/src/gpu/GrGpuFactory.cpp \
+ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
+ third_party/skia/src/gpu/GrMemoryPool.cpp \
+ third_party/skia/src/gpu/GrOvalRenderer.cpp \
+ third_party/skia/src/gpu/GrPaint.cpp \
+ third_party/skia/src/gpu/GrPath.cpp \
+ third_party/skia/src/gpu/GrPathRendererChain.cpp \
+ third_party/skia/src/gpu/GrPathRenderer.cpp \
+ third_party/skia/src/gpu/GrPathUtils.cpp \
+ third_party/skia/src/gpu/GrRectanizer.cpp \
+ third_party/skia/src/gpu/GrRectanizer_skyline.cpp \
+ third_party/skia/src/gpu/GrRenderTarget.cpp \
+ third_party/skia/src/gpu/GrReducedClip.cpp \
+ third_party/skia/src/gpu/GrResource.cpp \
+ third_party/skia/src/gpu/GrResourceCache.cpp \
+ third_party/skia/src/gpu/GrStencil.cpp \
+ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \
+ third_party/skia/src/gpu/GrStencilBuffer.cpp \
+ third_party/skia/src/gpu/GrSWMaskHelper.cpp \
+ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \
+ third_party/skia/src/gpu/GrSurface.cpp \
+ third_party/skia/src/gpu/GrTextContext.cpp \
+ third_party/skia/src/gpu/GrTextStrike.cpp \
+ third_party/skia/src/gpu/GrTexture.cpp \
+ third_party/skia/src/gpu/GrTextureAccess.cpp \
+ third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBezierEffect.cpp \
+ third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \
+ third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrTextureDomain.cpp \
+ third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \
+ third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \
+ third_party/skia/src/gpu/gl/GrGLCaps.cpp \
+ third_party/skia/src/gpu/gl/GrGLContext.cpp \
+ third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLExtensions.cpp \
+ third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLPath.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgram.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \
+ third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \
+ third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \
+ third_party/skia/src/gpu/gl/GrGLSL.cpp \
+ third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLTexture.cpp \
+ third_party/skia/src/gpu/gl/GrGLUtil.cpp \
+ third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \
+ third_party/skia/src/gpu/SkGpuDevice.cpp \
+ third_party/skia/src/gpu/SkGr.cpp \
+ third_party/skia/src/gpu/SkGrFontScaler.cpp \
+ third_party/skia/src/gpu/SkGrPixelRef.cpp \
+ third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \
+ third_party/skia/src/image/SkImage_Gpu.cpp \
+ third_party/skia/src/image/SkSurface_Gpu.cpp \
+ third_party/skia/src/gpu/gl/SkGLContextHelper.cpp \
+ third_party/skia/src/core/SkUtilsArm.cpp
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -fno-tree-sra \
+ -fuse-ld=gold \
+ -Wno-psabi \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -g \
+ -fomit-frame-pointer \
+ -fdata-sections \
+ -ffunction-sections
+
+MY_DEFS_Debug := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+ '-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-abi \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -fno-tree-sra \
+ -fuse-ld=gold \
+ -Wno-psabi \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -fno-ident \
+ -fdata-sections \
+ -ffunction-sections \
+ -fomit-frame-pointer
+
+MY_DEFS_Release := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DNDEBUG' \
+ '-DNVALGRIND' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-abi \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -Wl,-z,relro \
+ -Wl,-z,now \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--icf=safe \
+ -Wl,--fatal-warnings \
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
+ -Wl,-O1 \
+ -Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -Wl,-z,relro \
+ -Wl,-z,now \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--icf=safe \
+ -Wl,-O1 \
+ -Wl,--as-needed \
+ -Wl,--gc-sections \
+ -Wl,--fatal-warnings \
+ -Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES := \
+ cpufeatures
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+ libstlport \
+ libdl
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: skia_skia_library_gyp
@@ -635,12 +716,4 @@
.PHONY: skia_library
skia_library: skia_skia_library_gyp
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
- $(hide) echo "Gyp timestamp: $@"
- $(hide) mkdir -p $(dir $@)
- $(hide) touch $@
+include $(BUILD_STATIC_LIBRARY)
diff --git a/skia/skia_library.target.darwin-mips.mk b/skia/skia_library.target.darwin-mips.mk
index f40c8d6..c6ad5d7 100644
--- a/skia/skia_library.target.darwin-mips.mk
+++ b/skia/skia_library.target.darwin-mips.mk
@@ -2,631 +2,704 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := GYP
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := skia_skia_library_gyp
-LOCAL_MODULE_STEM := skia_library
-LOCAL_MODULE_SUFFIX := .stamp
+LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
gyp_intermediate_dir := $(call local-intermediates-dir)
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
+GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
-### Rules for action "generate_skia_library_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
- @echo "Gyp action: Generating skia_library shim headers ($@)"
- $(hide)cd $(gyp_local_path)/skia; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios; python ../tools/generate_shim_headers/generate_shim_headers.py --headers-root ../third_party/skia/include --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target" animator/SkAnimator.h animator/SkAnimatorView.h config/SkUserConfig.h core/Sk64.h core/SkAdvancedTypefaceMetrics.h core/SkAnnotation.h core/SkBitmap.h core/SkBitmapDevice.h core/SkBlitRow.h core/SkBounder.h core/SkCanvas.h core/SkChecksum.h core/SkChunkAlloc.h core/SkClipStack.h core/SkColor.h core/SkColorFilter.h core/SkColorPriv.h core/SkColorShader.h core/SkColorTable.h core/SkComposeShader.h core/SkData.h core/SkDataTable.h core/SkDeque.h core/SkDevice.h core/SkDeviceProperties.h core/SkDither.h core/SkDocument.h core/SkDraw.h core/SkDrawFilter.h core/SkDrawLooper.h core/SkEmptyShader.h core/SkEndian.h core/SkError.h core/SkFixed.h core/SkFlate.h core/SkFlattenable.h core/SkFlattenableBuffers.h core/SkFlattenableSerialization.h core/SkFloatBits.h core/SkFloatingPoint.h core/SkFontHost.h core/SkFontLCDConfig.h core/SkGeometry.h core/SkGraphics.h core/SkImage.h core/SkImageDecoder.h core/SkImageEncoder.h core/SkImageFilter.h core/SkImageFilterUtils.h core/SkImageGenerator.h core/SkImageInfo.h core/SkInstCnt.h core/SkLineClipper.h core/SkMallocPixelRef.h core/SkMask.h core/SkMaskFilter.h core/SkMath.h core/SkMatrix.h core/SkMetaData.h core/SkOSFile.h core/SkPackBits.h core/SkPaint.h core/SkPaintOptionsAndroid.h core/SkPath.h core/SkPathEffect.h core/SkPathMeasure.h core/SkPathRef.h core/SkPicture.h core/SkPixelRef.h core/SkPoint.h core/SkPostConfig.h core/SkPreConfig.h core/SkRRect.h core/SkRasterizer.h core/SkReader32.h core/SkRect.h core/SkRefCnt.h core/SkRegion.h core/SkScalar.h core/SkShader.h core/SkSize.h core/SkStream.h core/SkString.h core/SkStringUtils.h core/SkStrokeRec.h core/SkSurface.h core/SkTArray.h core/SkTDArray.h core/SkTDStack.h core/SkTDict.h core/SkTInternalLList.h core/SkTLazy.h core/SkTRegistry.h core/SkTSearch.h core/SkTemplates.h core/SkThread.h core/SkThread_platform.h core/SkTileGridPicture.h core/SkTime.h core/SkTrace.h core/SkTypeface.h core/SkTypes.h core/SkUnPreMultiply.h core/SkUnitMapper.h core/SkUtils.h core/SkWeakRefCnt.h core/SkWriter32.h core/SkXfermode.h device/xps/SkConstexprMath.h device/xps/SkXPSDevice.h effects/Sk1DPathEffect.h effects/Sk2DPathEffect.h effects/SkArithmeticMode.h effects/SkAvoidXfermode.h effects/SkBicubicImageFilter.h effects/SkBitmapAlphaThresholdShader.h effects/SkBitmapSource.h effects/SkBlurDrawLooper.h effects/SkBlurImageFilter.h effects/SkBlurMaskFilter.h effects/SkColorFilterImageFilter.h effects/SkColorMatrix.h effects/SkColorMatrixFilter.h effects/SkComposeImageFilter.h effects/SkCornerPathEffect.h effects/SkDashPathEffect.h effects/SkDiscretePathEffect.h effects/SkDisplacementMapEffect.h effects/SkDrawExtraPathEffect.h effects/SkDropShadowImageFilter.h effects/SkEmbossMaskFilter.h effects/SkGradientShader.h effects/SkKernel33MaskFilter.h effects/SkLayerDrawLooper.h effects/SkLayerRasterizer.h effects/SkLerpXfermode.h effects/SkLightingImageFilter.h effects/SkLumaColorFilter.h effects/SkMagnifierImageFilter.h effects/SkMatrixConvolutionImageFilter.h effects/SkMergeImageFilter.h effects/SkMorphologyImageFilter.h effects/SkOffsetImageFilter.h effects/SkPaintFlagsDrawFilter.h effects/SkPerlinNoiseShader.h effects/SkPictureImageFilter.h effects/SkPixelXorXfermode.h effects/SkPorterDuff.h effects/SkRectShaderImageFilter.h effects/SkStippleMaskFilter.h effects/SkTableColorFilter.h effects/SkTableMaskFilter.h effects/SkTestImageFilters.h effects/SkTileImageFilter.h effects/SkTransparentShader.h effects/SkXfermodeImageFilter.h gpu/GrBackendEffectFactory.h gpu/GrBitmapTextContext.h gpu/GrClipData.h gpu/GrColor.h gpu/GrConfig.h gpu/GrContext.h gpu/GrContextFactory.h gpu/GrCoordTransform.h gpu/GrDistanceFieldTextContext.h gpu/GrDrawEffect.h gpu/GrEffect.h gpu/GrEffectStage.h gpu/GrEffectUnitTest.h gpu/GrFontScaler.h gpu/GrGlyph.h gpu/GrKey.h gpu/GrPaint.h gpu/GrPathRendererChain.h gpu/GrPoint.h gpu/GrRect.h gpu/GrRenderTarget.h gpu/GrResource.h gpu/GrSurface.h gpu/GrTBackendEffectFactory.h gpu/GrTextContext.h gpu/GrTexture.h gpu/GrTextureAccess.h gpu/GrTypes.h gpu/GrTypesPriv.h gpu/GrUserConfig.h gpu/SkGpuDevice.h gpu/SkGr.h gpu/SkGrPixelRef.h gpu/SkGrTexturePixelRef.h gpu/gl/GrGLConfig.h gpu/gl/GrGLConfig_chrome.h gpu/gl/GrGLExtensions.h gpu/gl/GrGLFunctions.h gpu/gl/GrGLInterface.h gpu/gl/SkANGLEGLContext.h gpu/gl/SkDebugGLContext.h gpu/gl/SkGLContextHelper.h gpu/gl/SkMesaGLContext.h gpu/gl/SkNativeGLContext.h gpu/gl/SkNullGLContext.h images/SkForceLinking.h images/SkImageRef.h images/SkImageRef_GlobalPool.h images/SkImages.h images/SkMovie.h images/SkPageFlipper.h pathops/SkPathOps.h pdf/SkPDFDevice.h pdf/SkPDFDocument.h pipe/SkGPipe.h ports/SkFontConfigInterface.h ports/SkFontMgr.h ports/SkFontStyle.h ports/SkHarfBuzzFont.h ports/SkTypeface_android.h ports/SkTypeface_mac.h ports/SkTypeface_win.h svg/SkSVGAttribute.h svg/SkSVGBase.h svg/SkSVGPaintState.h svg/SkSVGParser.h svg/SkSVGTypes.h text/SkTextLayout.h utils/SkBoundaryPatch.h utils/SkCamera.h utils/SkCanvasStateUtils.h utils/SkCondVar.h utils/SkCountdown.h utils/SkCubicInterval.h utils/SkCullPoints.h utils/SkDebugUtils.h utils/SkDeferredCanvas.h utils/SkDumpCanvas.h utils/SkFrontBufferedStream.h utils/SkInterpolator.h utils/SkJSON.h utils/SkJSONCPP.h utils/SkLayer.h utils/SkLua.h utils/SkLuaCanvas.h utils/SkMatrix44.h utils/SkMeshUtils.h utils/SkNWayCanvas.h utils/SkNinePatch.h utils/SkNullCanvas.h utils/SkParse.h utils/SkParsePaint.h utils/SkParsePath.h utils/SkPathUtils.h utils/SkPictureUtils.h utils/SkProxyCanvas.h utils/SkRTConf.h utils/SkRandom.h utils/SkRunnable.h utils/SkThreadPool.h utils/SkUnitMappers.h utils/SkWGL.h utils/ios/SkStream_NSData.h utils/mac/SkCGUtils.h utils/win/SkAutoCoInitialize.h utils/win/SkHRESULT.h utils/win/SkIStream.h utils/win/SkTScopedComPtr.h views/SkApplication.h views/SkBGViewArtist.h views/SkEvent.h views/SkEventSink.h views/SkKey.h views/SkOSMenu.h views/SkOSWindow_Android.h views/SkOSWindow_Mac.h views/SkOSWindow_NaCl.h views/SkOSWindow_SDL.h views/SkOSWindow_Unix.h views/SkOSWindow_Win.h views/SkOSWindow_iOS.h views/SkStackViewLayout.h views/SkSystemEventTypes.h views/SkTextBox.h views/SkTouchGesture.h views/SkView.h views/SkViewInflate.h views/SkWidget.h views/SkWindow.h views/android/AndroidKeyToSkKey.h views/animated/SkBorderView.h views/animated/SkImageView.h views/animated/SkProgressBarView.h views/animated/SkScrollBarView.h views/animated/SkWidgetViews.h views/unix/XkeysToSkKeys.h views/unix/keysym2ucs.h xml/SkBML_WXMLParser.h xml/SkBML_XMLParser.h xml/SkDOM.h xml/SkJS.h xml/SkXMLParser.h xml/SkXMLWriter.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+ third_party/skia/src/core/SkFlate.cpp \
+ third_party/skia/src/core/SkPaintOptionsAndroid.cpp \
+ third_party/skia/src/ports/SkImageDecoder_empty.cpp \
+ third_party/skia/src/images/SkScaledBitmapSampler.cpp \
+ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \
+ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \
+ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \
+ third_party/skia/src/ports/SkFontConfigParser_android.cpp \
+ third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \
+ third_party/skia/src/ports/SkOSFile_posix.cpp \
+ third_party/skia/src/ports/SkOSFile_stdio.cpp \
+ third_party/skia/src/ports/SkThread_pthread.cpp \
+ third_party/skia/src/ports/SkTime_Unix.cpp \
+ third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
+ third_party/skia/src/sfnt/SkOTUtils.cpp \
+ third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
+ third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
+ third_party/skia/src/utils/debugger/SkObjectParser.cpp \
+ third_party/skia/src/utils/SkBase64.cpp \
+ third_party/skia/src/utils/SkBitSet.cpp \
+ third_party/skia/src/utils/SkCanvasStack.cpp \
+ third_party/skia/src/utils/SkCanvasStateUtils.cpp \
+ third_party/skia/src/utils/SkDeferredCanvas.cpp \
+ third_party/skia/src/utils/SkMatrix44.cpp \
+ third_party/skia/src/utils/SkNullCanvas.cpp \
+ third_party/skia/src/utils/SkNWayCanvas.cpp \
+ third_party/skia/src/utils/SkPictureUtils.cpp \
+ third_party/skia/src/utils/SkProxyCanvas.cpp \
+ third_party/skia/src/utils/SkRTConf.cpp \
+ third_party/skia/src/core/Sk64.cpp \
+ third_party/skia/src/core/SkAAClip.cpp \
+ third_party/skia/src/core/SkAnnotation.cpp \
+ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \
+ third_party/skia/src/core/SkAlphaRuns.cpp \
+ third_party/skia/src/core/SkBBoxRecord.cpp \
+ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
+ third_party/skia/src/core/SkBitmap.cpp \
+ third_party/skia/src/core/SkBitmapDevice.cpp \
+ third_party/skia/src/core/SkBitmapFilter.cpp \
+ third_party/skia/src/core/SkBitmapHeap.cpp \
+ third_party/skia/src/core/SkBitmapProcShader.cpp \
+ third_party/skia/src/core/SkBitmapProcState.cpp \
+ third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
+ third_party/skia/src/core/SkBitmapScaler.cpp \
+ third_party/skia/src/core/SkBitmap_scroll.cpp \
+ third_party/skia/src/core/SkBlitMask_D32.cpp \
+ third_party/skia/src/core/SkBlitRow_D16.cpp \
+ third_party/skia/src/core/SkBlitRow_D32.cpp \
+ third_party/skia/src/core/SkBlitter.cpp \
+ third_party/skia/src/core/SkBlitter_A8.cpp \
+ third_party/skia/src/core/SkBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkBlitter_Sprite.cpp \
+ third_party/skia/src/core/SkBuffer.cpp \
+ third_party/skia/src/core/SkCanvas.cpp \
+ third_party/skia/src/core/SkChunkAlloc.cpp \
+ third_party/skia/src/core/SkClipStack.cpp \
+ third_party/skia/src/core/SkColor.cpp \
+ third_party/skia/src/core/SkColorFilter.cpp \
+ third_party/skia/src/core/SkColorTable.cpp \
+ third_party/skia/src/core/SkComposeShader.cpp \
+ third_party/skia/src/core/SkConfig8888.cpp \
+ third_party/skia/src/core/SkConvolver.cpp \
+ third_party/skia/src/core/SkCordic.cpp \
+ third_party/skia/src/core/SkCubicClipper.cpp \
+ third_party/skia/src/core/SkData.cpp \
+ third_party/skia/src/core/SkDataTable.cpp \
+ third_party/skia/src/core/SkDebug.cpp \
+ third_party/skia/src/core/SkDeque.cpp \
+ third_party/skia/src/core/SkDevice.cpp \
+ third_party/skia/src/core/SkDeviceLooper.cpp \
+ third_party/skia/src/core/SkDeviceProfile.cpp \
+ third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \
+ third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \
+ third_party/skia/src/core/SkDither.cpp \
+ third_party/skia/src/core/SkDraw.cpp \
+ third_party/skia/src/core/SkDrawLooper.cpp \
+ third_party/skia/src/core/SkEdgeBuilder.cpp \
+ third_party/skia/src/core/SkEdgeClipper.cpp \
+ third_party/skia/src/core/SkEdge.cpp \
+ third_party/skia/src/core/SkError.cpp \
+ third_party/skia/src/core/SkFilterProc.cpp \
+ third_party/skia/src/core/SkFilterShader.cpp \
+ third_party/skia/src/core/SkFlattenable.cpp \
+ third_party/skia/src/core/SkFlattenableBuffers.cpp \
+ third_party/skia/src/core/SkFlattenableSerialization.cpp \
+ third_party/skia/src/core/SkFloat.cpp \
+ third_party/skia/src/core/SkFloatBits.cpp \
+ third_party/skia/src/core/SkFontHost.cpp \
+ third_party/skia/src/core/SkFontDescriptor.cpp \
+ third_party/skia/src/core/SkFontStream.cpp \
+ third_party/skia/src/core/SkGeometry.cpp \
+ third_party/skia/src/core/SkGlyphCache.cpp \
+ third_party/skia/src/core/SkGraphics.cpp \
+ third_party/skia/src/core/SkInstCnt.cpp \
+ third_party/skia/src/core/SkImageFilter.cpp \
+ third_party/skia/src/core/SkImageFilterUtils.cpp \
+ third_party/skia/src/core/SkImageInfo.cpp \
+ third_party/skia/src/core/SkLineClipper.cpp \
+ third_party/skia/src/core/SkMallocPixelRef.cpp \
+ third_party/skia/src/core/SkMask.cpp \
+ third_party/skia/src/core/SkMaskFilter.cpp \
+ third_party/skia/src/core/SkMaskGamma.cpp \
+ third_party/skia/src/core/SkMath.cpp \
+ third_party/skia/src/core/SkMatrix.cpp \
+ third_party/skia/src/core/SkMetaData.cpp \
+ third_party/skia/src/core/SkMipMap.cpp \
+ third_party/skia/src/core/SkOrderedReadBuffer.cpp \
+ third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
+ third_party/skia/src/core/SkPackBits.cpp \
+ third_party/skia/src/core/SkPaint.cpp \
+ third_party/skia/src/core/SkPaintPriv.cpp \
+ third_party/skia/src/core/SkPath.cpp \
+ third_party/skia/src/core/SkPathEffect.cpp \
+ third_party/skia/src/core/SkPathHeap.cpp \
+ third_party/skia/src/core/SkPathMeasure.cpp \
+ third_party/skia/src/core/SkPathRef.cpp \
+ third_party/skia/src/core/SkPicture.cpp \
+ third_party/skia/src/core/SkPictureFlat.cpp \
+ third_party/skia/src/core/SkPicturePlayback.cpp \
+ third_party/skia/src/core/SkPictureRecord.cpp \
+ third_party/skia/src/core/SkPictureStateTree.cpp \
+ third_party/skia/src/core/SkPixelRef.cpp \
+ third_party/skia/src/core/SkPoint.cpp \
+ third_party/skia/src/core/SkProcSpriteBlitter.cpp \
+ third_party/skia/src/core/SkPtrRecorder.cpp \
+ third_party/skia/src/core/SkQuadClipper.cpp \
+ third_party/skia/src/core/SkRasterClip.cpp \
+ third_party/skia/src/core/SkRasterizer.cpp \
+ third_party/skia/src/core/SkRect.cpp \
+ third_party/skia/src/core/SkRefDict.cpp \
+ third_party/skia/src/core/SkRegion.cpp \
+ third_party/skia/src/core/SkRegion_path.cpp \
+ third_party/skia/src/core/SkRRect.cpp \
+ third_party/skia/src/core/SkRTree.cpp \
+ third_party/skia/src/core/SkScaledImageCache.cpp \
+ third_party/skia/src/core/SkScalar.cpp \
+ third_party/skia/src/core/SkScalerContext.cpp \
+ third_party/skia/src/core/SkScan.cpp \
+ third_party/skia/src/core/SkScan_AntiPath.cpp \
+ third_party/skia/src/core/SkScan_Antihair.cpp \
+ third_party/skia/src/core/SkScan_Hairline.cpp \
+ third_party/skia/src/core/SkScan_Path.cpp \
+ third_party/skia/src/core/SkShader.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkStream.cpp \
+ third_party/skia/src/core/SkString.cpp \
+ third_party/skia/src/core/SkStringUtils.cpp \
+ third_party/skia/src/core/SkStroke.cpp \
+ third_party/skia/src/core/SkStrokeRec.cpp \
+ third_party/skia/src/core/SkStrokerPriv.cpp \
+ third_party/skia/src/core/SkTileGrid.cpp \
+ third_party/skia/src/core/SkTileGridPicture.cpp \
+ third_party/skia/src/core/SkTLS.cpp \
+ third_party/skia/src/core/SkTSearch.cpp \
+ third_party/skia/src/core/SkTypeface.cpp \
+ third_party/skia/src/core/SkTypefaceCache.cpp \
+ third_party/skia/src/core/SkUnPreMultiply.cpp \
+ third_party/skia/src/core/SkUtils.cpp \
+ third_party/skia/src/core/SkValidatingReadBuffer.cpp \
+ third_party/skia/src/core/SkWriter32.cpp \
+ third_party/skia/src/core/SkXfermode.cpp \
+ third_party/skia/src/doc/SkDocument.cpp \
+ third_party/skia/src/image/SkDataPixelRef.cpp \
+ third_party/skia/src/image/SkImage.cpp \
+ third_party/skia/src/image/SkImagePriv.cpp \
+ third_party/skia/src/image/SkImage_Codec.cpp \
+ third_party/skia/src/image/SkImage_Picture.cpp \
+ third_party/skia/src/image/SkImage_Raster.cpp \
+ third_party/skia/src/image/SkSurface.cpp \
+ third_party/skia/src/image/SkSurface_Picture.cpp \
+ third_party/skia/src/image/SkSurface_Raster.cpp \
+ third_party/skia/src/pipe/SkGPipeRead.cpp \
+ third_party/skia/src/pipe/SkGPipeWrite.cpp \
+ third_party/skia/src/lazy/SkCachingPixelRef.cpp \
+ third_party/skia/src/pathops/SkAddIntersections.cpp \
+ third_party/skia/src/pathops/SkDCubicIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicToQuads.cpp \
+ third_party/skia/src/pathops/SkDLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadImplicit.cpp \
+ third_party/skia/src/pathops/SkDQuadIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \
+ third_party/skia/src/pathops/SkIntersections.cpp \
+ third_party/skia/src/pathops/SkOpAngle.cpp \
+ third_party/skia/src/pathops/SkOpContour.cpp \
+ third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \
+ third_party/skia/src/pathops/SkOpSegment.cpp \
+ third_party/skia/src/pathops/SkPathOpsBounds.cpp \
+ third_party/skia/src/pathops/SkPathOpsCommon.cpp \
+ third_party/skia/src/pathops/SkPathOpsCubic.cpp \
+ third_party/skia/src/pathops/SkPathOpsDebug.cpp \
+ third_party/skia/src/pathops/SkPathOpsLine.cpp \
+ third_party/skia/src/pathops/SkPathOpsOp.cpp \
+ third_party/skia/src/pathops/SkPathOpsPoint.cpp \
+ third_party/skia/src/pathops/SkPathOpsQuad.cpp \
+ third_party/skia/src/pathops/SkPathOpsRect.cpp \
+ third_party/skia/src/pathops/SkPathOpsSimplify.cpp \
+ third_party/skia/src/pathops/SkPathOpsTriangle.cpp \
+ third_party/skia/src/pathops/SkPathOpsTypes.cpp \
+ third_party/skia/src/pathops/SkPathWriter.cpp \
+ third_party/skia/src/pathops/SkQuarticRoot.cpp \
+ third_party/skia/src/pathops/SkReduceOrder.cpp \
+ third_party/skia/src/effects/Sk1DPathEffect.cpp \
+ third_party/skia/src/effects/Sk2DPathEffect.cpp \
+ third_party/skia/src/effects/SkArithmeticMode.cpp \
+ third_party/skia/src/effects/SkAvoidXfermode.cpp \
+ third_party/skia/src/effects/SkBicubicImageFilter.cpp \
+ third_party/skia/src/effects/SkBitmapAlphaThresholdShader.cpp \
+ third_party/skia/src/effects/SkBitmapSource.cpp \
+ third_party/skia/src/effects/SkBlurDrawLooper.cpp \
+ third_party/skia/src/effects/SkBlurMask.cpp \
+ third_party/skia/src/effects/SkBlurImageFilter.cpp \
+ third_party/skia/src/effects/SkBlurMaskFilter.cpp \
+ third_party/skia/src/effects/SkColorFilters.cpp \
+ third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
+ third_party/skia/src/effects/SkColorMatrix.cpp \
+ third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
+ third_party/skia/src/effects/SkCornerPathEffect.cpp \
+ third_party/skia/src/effects/SkDashPathEffect.cpp \
+ third_party/skia/src/effects/SkDiscretePathEffect.cpp \
+ third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+ third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
+ third_party/skia/src/effects/SkEmbossMask.cpp \
+ third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+ third_party/skia/src/effects/SkGpuBlurUtils.cpp \
+ third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
+ third_party/skia/src/effects/SkLayerDrawLooper.cpp \
+ third_party/skia/src/effects/SkLayerRasterizer.cpp \
+ third_party/skia/src/effects/SkLerpXfermode.cpp \
+ third_party/skia/src/effects/SkLightingImageFilter.cpp \
+ third_party/skia/src/effects/SkLumaColorFilter.cpp \
+ third_party/skia/src/effects/SkMagnifierImageFilter.cpp \
+ third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \
+ third_party/skia/src/effects/SkMergeImageFilter.cpp \
+ third_party/skia/src/effects/SkMorphologyImageFilter.cpp \
+ third_party/skia/src/effects/SkOffsetImageFilter.cpp \
+ third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \
+ third_party/skia/src/effects/SkPerlinNoiseShader.cpp \
+ third_party/skia/src/effects/SkPictureImageFilter.cpp \
+ third_party/skia/src/effects/SkPixelXorXfermode.cpp \
+ third_party/skia/src/effects/SkPorterDuff.cpp \
+ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \
+ third_party/skia/src/effects/SkStippleMaskFilter.cpp \
+ third_party/skia/src/effects/SkTableColorFilter.cpp \
+ third_party/skia/src/effects/SkTableMaskFilter.cpp \
+ third_party/skia/src/effects/SkTestImageFilters.cpp \
+ third_party/skia/src/effects/SkTileImageFilter.cpp \
+ third_party/skia/src/effects/SkTransparentShader.cpp \
+ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \
+ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \
+ third_party/skia/src/effects/gradients/SkClampRange.cpp \
+ third_party/skia/src/effects/gradients/SkGradientShader.cpp \
+ third_party/skia/src/effects/gradients/SkLinearGradient.cpp \
+ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \
+ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \
+ third_party/skia/src/pdf/SkPDFCatalog.cpp \
+ third_party/skia/src/pdf/SkPDFDevice.cpp \
+ third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \
+ third_party/skia/src/pdf/SkPDFDocument.cpp \
+ third_party/skia/src/pdf/SkPDFFont.cpp \
+ third_party/skia/src/pdf/SkPDFFormXObject.cpp \
+ third_party/skia/src/pdf/SkPDFGraphicState.cpp \
+ third_party/skia/src/pdf/SkPDFImage.cpp \
+ third_party/skia/src/pdf/SkPDFPage.cpp \
+ third_party/skia/src/pdf/SkPDFResourceDict.cpp \
+ third_party/skia/src/pdf/SkPDFShader.cpp \
+ third_party/skia/src/pdf/SkPDFStream.cpp \
+ third_party/skia/src/pdf/SkPDFTypes.cpp \
+ third_party/skia/src/pdf/SkPDFUtils.cpp \
+ third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \
+ third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \
+ third_party/skia/src/gpu/GrAARectRenderer.cpp \
+ third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \
+ third_party/skia/src/gpu/GrAllocPool.cpp \
+ third_party/skia/src/gpu/GrAtlas.cpp \
+ third_party/skia/src/gpu/GrBitmapTextContext.cpp \
+ third_party/skia/src/gpu/GrBlend.cpp \
+ third_party/skia/src/gpu/GrBufferAllocPool.cpp \
+ third_party/skia/src/gpu/GrCacheID.cpp \
+ third_party/skia/src/gpu/GrClipData.cpp \
+ third_party/skia/src/gpu/GrContext.cpp \
+ third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \
+ third_party/skia/src/gpu/GrDrawState.cpp \
+ third_party/skia/src/gpu/GrDrawTarget.cpp \
+ third_party/skia/src/gpu/GrEffect.cpp \
+ third_party/skia/src/gpu/GrClipMaskCache.cpp \
+ third_party/skia/src/gpu/GrClipMaskManager.cpp \
+ third_party/skia/src/gpu/GrGpu.cpp \
+ third_party/skia/src/gpu/GrGpuFactory.cpp \
+ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
+ third_party/skia/src/gpu/GrMemoryPool.cpp \
+ third_party/skia/src/gpu/GrOvalRenderer.cpp \
+ third_party/skia/src/gpu/GrPaint.cpp \
+ third_party/skia/src/gpu/GrPath.cpp \
+ third_party/skia/src/gpu/GrPathRendererChain.cpp \
+ third_party/skia/src/gpu/GrPathRenderer.cpp \
+ third_party/skia/src/gpu/GrPathUtils.cpp \
+ third_party/skia/src/gpu/GrRectanizer.cpp \
+ third_party/skia/src/gpu/GrRectanizer_skyline.cpp \
+ third_party/skia/src/gpu/GrRenderTarget.cpp \
+ third_party/skia/src/gpu/GrReducedClip.cpp \
+ third_party/skia/src/gpu/GrResource.cpp \
+ third_party/skia/src/gpu/GrResourceCache.cpp \
+ third_party/skia/src/gpu/GrStencil.cpp \
+ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \
+ third_party/skia/src/gpu/GrStencilBuffer.cpp \
+ third_party/skia/src/gpu/GrSWMaskHelper.cpp \
+ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \
+ third_party/skia/src/gpu/GrSurface.cpp \
+ third_party/skia/src/gpu/GrTextContext.cpp \
+ third_party/skia/src/gpu/GrTextStrike.cpp \
+ third_party/skia/src/gpu/GrTexture.cpp \
+ third_party/skia/src/gpu/GrTextureAccess.cpp \
+ third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBezierEffect.cpp \
+ third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \
+ third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrTextureDomain.cpp \
+ third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \
+ third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \
+ third_party/skia/src/gpu/gl/GrGLCaps.cpp \
+ third_party/skia/src/gpu/gl/GrGLContext.cpp \
+ third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLExtensions.cpp \
+ third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLPath.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgram.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \
+ third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \
+ third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \
+ third_party/skia/src/gpu/gl/GrGLSL.cpp \
+ third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLTexture.cpp \
+ third_party/skia/src/gpu/gl/GrGLUtil.cpp \
+ third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \
+ third_party/skia/src/gpu/SkGpuDevice.cpp \
+ third_party/skia/src/gpu/SkGr.cpp \
+ third_party/skia/src/gpu/SkGrFontScaler.cpp \
+ third_party/skia/src/gpu/SkGrPixelRef.cpp \
+ third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \
+ third_party/skia/src/image/SkImage_Gpu.cpp \
+ third_party/skia/src/image/SkSurface_Gpu.cpp \
+ third_party/skia/src/gpu/gl/SkGLContextHelper.cpp
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -EL \
+ -mhard-float \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -g \
+ -fomit-frame-pointer \
+ -fdata-sections \
+ -ffunction-sections
+
+MY_DEFS_Debug := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+ '-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-uninitialized \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -EL \
+ -mhard-float \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -fno-ident \
+ -fdata-sections \
+ -ffunction-sections \
+ -fomit-frame-pointer
+
+MY_DEFS_Release := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DNDEBUG' \
+ '-DNVALGRIND' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-uninitialized \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -EL \
+ -Wl,--no-keep-memory \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--fatal-warnings \
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
+ -Wl,-O1 \
+ -Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -EL \
+ -Wl,--no-keep-memory \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,-O1 \
+ -Wl,--as-needed \
+ -Wl,--gc-sections \
+ -Wl,--fatal-warnings \
+ -Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+ libstlport \
+ libdl
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: skia_skia_library_gyp
@@ -635,12 +708,4 @@
.PHONY: skia_library
skia_library: skia_skia_library_gyp
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
- $(hide) echo "Gyp timestamp: $@"
- $(hide) mkdir -p $(dir $@)
- $(hide) touch $@
+include $(BUILD_STATIC_LIBRARY)
diff --git a/skia/skia_library.target.darwin-x86.mk b/skia/skia_library.target.darwin-x86.mk
index f40c8d6..c9af573 100644
--- a/skia/skia_library.target.darwin-x86.mk
+++ b/skia/skia_library.target.darwin-x86.mk
@@ -2,631 +2,709 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := GYP
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := skia_skia_library_gyp
-LOCAL_MODULE_STEM := skia_library
-LOCAL_MODULE_SUFFIX := .stamp
+LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
gyp_intermediate_dir := $(call local-intermediates-dir)
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
+GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
-### Rules for action "generate_skia_library_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
- @echo "Gyp action: Generating skia_library shim headers ($@)"
- $(hide)cd $(gyp_local_path)/skia; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios; python ../tools/generate_shim_headers/generate_shim_headers.py --headers-root ../third_party/skia/include --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target" animator/SkAnimator.h animator/SkAnimatorView.h config/SkUserConfig.h core/Sk64.h core/SkAdvancedTypefaceMetrics.h core/SkAnnotation.h core/SkBitmap.h core/SkBitmapDevice.h core/SkBlitRow.h core/SkBounder.h core/SkCanvas.h core/SkChecksum.h core/SkChunkAlloc.h core/SkClipStack.h core/SkColor.h core/SkColorFilter.h core/SkColorPriv.h core/SkColorShader.h core/SkColorTable.h core/SkComposeShader.h core/SkData.h core/SkDataTable.h core/SkDeque.h core/SkDevice.h core/SkDeviceProperties.h core/SkDither.h core/SkDocument.h core/SkDraw.h core/SkDrawFilter.h core/SkDrawLooper.h core/SkEmptyShader.h core/SkEndian.h core/SkError.h core/SkFixed.h core/SkFlate.h core/SkFlattenable.h core/SkFlattenableBuffers.h core/SkFlattenableSerialization.h core/SkFloatBits.h core/SkFloatingPoint.h core/SkFontHost.h core/SkFontLCDConfig.h core/SkGeometry.h core/SkGraphics.h core/SkImage.h core/SkImageDecoder.h core/SkImageEncoder.h core/SkImageFilter.h core/SkImageFilterUtils.h core/SkImageGenerator.h core/SkImageInfo.h core/SkInstCnt.h core/SkLineClipper.h core/SkMallocPixelRef.h core/SkMask.h core/SkMaskFilter.h core/SkMath.h core/SkMatrix.h core/SkMetaData.h core/SkOSFile.h core/SkPackBits.h core/SkPaint.h core/SkPaintOptionsAndroid.h core/SkPath.h core/SkPathEffect.h core/SkPathMeasure.h core/SkPathRef.h core/SkPicture.h core/SkPixelRef.h core/SkPoint.h core/SkPostConfig.h core/SkPreConfig.h core/SkRRect.h core/SkRasterizer.h core/SkReader32.h core/SkRect.h core/SkRefCnt.h core/SkRegion.h core/SkScalar.h core/SkShader.h core/SkSize.h core/SkStream.h core/SkString.h core/SkStringUtils.h core/SkStrokeRec.h core/SkSurface.h core/SkTArray.h core/SkTDArray.h core/SkTDStack.h core/SkTDict.h core/SkTInternalLList.h core/SkTLazy.h core/SkTRegistry.h core/SkTSearch.h core/SkTemplates.h core/SkThread.h core/SkThread_platform.h core/SkTileGridPicture.h core/SkTime.h core/SkTrace.h core/SkTypeface.h core/SkTypes.h core/SkUnPreMultiply.h core/SkUnitMapper.h core/SkUtils.h core/SkWeakRefCnt.h core/SkWriter32.h core/SkXfermode.h device/xps/SkConstexprMath.h device/xps/SkXPSDevice.h effects/Sk1DPathEffect.h effects/Sk2DPathEffect.h effects/SkArithmeticMode.h effects/SkAvoidXfermode.h effects/SkBicubicImageFilter.h effects/SkBitmapAlphaThresholdShader.h effects/SkBitmapSource.h effects/SkBlurDrawLooper.h effects/SkBlurImageFilter.h effects/SkBlurMaskFilter.h effects/SkColorFilterImageFilter.h effects/SkColorMatrix.h effects/SkColorMatrixFilter.h effects/SkComposeImageFilter.h effects/SkCornerPathEffect.h effects/SkDashPathEffect.h effects/SkDiscretePathEffect.h effects/SkDisplacementMapEffect.h effects/SkDrawExtraPathEffect.h effects/SkDropShadowImageFilter.h effects/SkEmbossMaskFilter.h effects/SkGradientShader.h effects/SkKernel33MaskFilter.h effects/SkLayerDrawLooper.h effects/SkLayerRasterizer.h effects/SkLerpXfermode.h effects/SkLightingImageFilter.h effects/SkLumaColorFilter.h effects/SkMagnifierImageFilter.h effects/SkMatrixConvolutionImageFilter.h effects/SkMergeImageFilter.h effects/SkMorphologyImageFilter.h effects/SkOffsetImageFilter.h effects/SkPaintFlagsDrawFilter.h effects/SkPerlinNoiseShader.h effects/SkPictureImageFilter.h effects/SkPixelXorXfermode.h effects/SkPorterDuff.h effects/SkRectShaderImageFilter.h effects/SkStippleMaskFilter.h effects/SkTableColorFilter.h effects/SkTableMaskFilter.h effects/SkTestImageFilters.h effects/SkTileImageFilter.h effects/SkTransparentShader.h effects/SkXfermodeImageFilter.h gpu/GrBackendEffectFactory.h gpu/GrBitmapTextContext.h gpu/GrClipData.h gpu/GrColor.h gpu/GrConfig.h gpu/GrContext.h gpu/GrContextFactory.h gpu/GrCoordTransform.h gpu/GrDistanceFieldTextContext.h gpu/GrDrawEffect.h gpu/GrEffect.h gpu/GrEffectStage.h gpu/GrEffectUnitTest.h gpu/GrFontScaler.h gpu/GrGlyph.h gpu/GrKey.h gpu/GrPaint.h gpu/GrPathRendererChain.h gpu/GrPoint.h gpu/GrRect.h gpu/GrRenderTarget.h gpu/GrResource.h gpu/GrSurface.h gpu/GrTBackendEffectFactory.h gpu/GrTextContext.h gpu/GrTexture.h gpu/GrTextureAccess.h gpu/GrTypes.h gpu/GrTypesPriv.h gpu/GrUserConfig.h gpu/SkGpuDevice.h gpu/SkGr.h gpu/SkGrPixelRef.h gpu/SkGrTexturePixelRef.h gpu/gl/GrGLConfig.h gpu/gl/GrGLConfig_chrome.h gpu/gl/GrGLExtensions.h gpu/gl/GrGLFunctions.h gpu/gl/GrGLInterface.h gpu/gl/SkANGLEGLContext.h gpu/gl/SkDebugGLContext.h gpu/gl/SkGLContextHelper.h gpu/gl/SkMesaGLContext.h gpu/gl/SkNativeGLContext.h gpu/gl/SkNullGLContext.h images/SkForceLinking.h images/SkImageRef.h images/SkImageRef_GlobalPool.h images/SkImages.h images/SkMovie.h images/SkPageFlipper.h pathops/SkPathOps.h pdf/SkPDFDevice.h pdf/SkPDFDocument.h pipe/SkGPipe.h ports/SkFontConfigInterface.h ports/SkFontMgr.h ports/SkFontStyle.h ports/SkHarfBuzzFont.h ports/SkTypeface_android.h ports/SkTypeface_mac.h ports/SkTypeface_win.h svg/SkSVGAttribute.h svg/SkSVGBase.h svg/SkSVGPaintState.h svg/SkSVGParser.h svg/SkSVGTypes.h text/SkTextLayout.h utils/SkBoundaryPatch.h utils/SkCamera.h utils/SkCanvasStateUtils.h utils/SkCondVar.h utils/SkCountdown.h utils/SkCubicInterval.h utils/SkCullPoints.h utils/SkDebugUtils.h utils/SkDeferredCanvas.h utils/SkDumpCanvas.h utils/SkFrontBufferedStream.h utils/SkInterpolator.h utils/SkJSON.h utils/SkJSONCPP.h utils/SkLayer.h utils/SkLua.h utils/SkLuaCanvas.h utils/SkMatrix44.h utils/SkMeshUtils.h utils/SkNWayCanvas.h utils/SkNinePatch.h utils/SkNullCanvas.h utils/SkParse.h utils/SkParsePaint.h utils/SkParsePath.h utils/SkPathUtils.h utils/SkPictureUtils.h utils/SkProxyCanvas.h utils/SkRTConf.h utils/SkRandom.h utils/SkRunnable.h utils/SkThreadPool.h utils/SkUnitMappers.h utils/SkWGL.h utils/ios/SkStream_NSData.h utils/mac/SkCGUtils.h utils/win/SkAutoCoInitialize.h utils/win/SkHRESULT.h utils/win/SkIStream.h utils/win/SkTScopedComPtr.h views/SkApplication.h views/SkBGViewArtist.h views/SkEvent.h views/SkEventSink.h views/SkKey.h views/SkOSMenu.h views/SkOSWindow_Android.h views/SkOSWindow_Mac.h views/SkOSWindow_NaCl.h views/SkOSWindow_SDL.h views/SkOSWindow_Unix.h views/SkOSWindow_Win.h views/SkOSWindow_iOS.h views/SkStackViewLayout.h views/SkSystemEventTypes.h views/SkTextBox.h views/SkTouchGesture.h views/SkView.h views/SkViewInflate.h views/SkWidget.h views/SkWindow.h views/android/AndroidKeyToSkKey.h views/animated/SkBorderView.h views/animated/SkImageView.h views/animated/SkProgressBarView.h views/animated/SkScrollBarView.h views/animated/SkWidgetViews.h views/unix/XkeysToSkKeys.h views/unix/keysym2ucs.h xml/SkBML_WXMLParser.h xml/SkBML_XMLParser.h xml/SkDOM.h xml/SkJS.h xml/SkXMLParser.h xml/SkXMLWriter.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+ third_party/skia/src/core/SkFlate.cpp \
+ third_party/skia/src/core/SkPaintOptionsAndroid.cpp \
+ third_party/skia/src/ports/SkImageDecoder_empty.cpp \
+ third_party/skia/src/images/SkScaledBitmapSampler.cpp \
+ third_party/skia/src/opts/opts_check_SSE2.cpp \
+ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \
+ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \
+ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \
+ third_party/skia/src/ports/SkFontConfigParser_android.cpp \
+ third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \
+ third_party/skia/src/ports/SkOSFile_posix.cpp \
+ third_party/skia/src/ports/SkOSFile_stdio.cpp \
+ third_party/skia/src/ports/SkThread_pthread.cpp \
+ third_party/skia/src/ports/SkTime_Unix.cpp \
+ third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
+ third_party/skia/src/sfnt/SkOTUtils.cpp \
+ third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
+ third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
+ third_party/skia/src/utils/debugger/SkObjectParser.cpp \
+ third_party/skia/src/utils/SkBase64.cpp \
+ third_party/skia/src/utils/SkBitSet.cpp \
+ third_party/skia/src/utils/SkCanvasStack.cpp \
+ third_party/skia/src/utils/SkCanvasStateUtils.cpp \
+ third_party/skia/src/utils/SkDeferredCanvas.cpp \
+ third_party/skia/src/utils/SkMatrix44.cpp \
+ third_party/skia/src/utils/SkNullCanvas.cpp \
+ third_party/skia/src/utils/SkNWayCanvas.cpp \
+ third_party/skia/src/utils/SkPictureUtils.cpp \
+ third_party/skia/src/utils/SkProxyCanvas.cpp \
+ third_party/skia/src/utils/SkRTConf.cpp \
+ third_party/skia/src/core/Sk64.cpp \
+ third_party/skia/src/core/SkAAClip.cpp \
+ third_party/skia/src/core/SkAnnotation.cpp \
+ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \
+ third_party/skia/src/core/SkAlphaRuns.cpp \
+ third_party/skia/src/core/SkBBoxRecord.cpp \
+ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
+ third_party/skia/src/core/SkBitmap.cpp \
+ third_party/skia/src/core/SkBitmapDevice.cpp \
+ third_party/skia/src/core/SkBitmapFilter.cpp \
+ third_party/skia/src/core/SkBitmapHeap.cpp \
+ third_party/skia/src/core/SkBitmapProcShader.cpp \
+ third_party/skia/src/core/SkBitmapProcState.cpp \
+ third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
+ third_party/skia/src/core/SkBitmapScaler.cpp \
+ third_party/skia/src/core/SkBitmap_scroll.cpp \
+ third_party/skia/src/core/SkBlitMask_D32.cpp \
+ third_party/skia/src/core/SkBlitRow_D16.cpp \
+ third_party/skia/src/core/SkBlitRow_D32.cpp \
+ third_party/skia/src/core/SkBlitter.cpp \
+ third_party/skia/src/core/SkBlitter_A8.cpp \
+ third_party/skia/src/core/SkBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkBlitter_Sprite.cpp \
+ third_party/skia/src/core/SkBuffer.cpp \
+ third_party/skia/src/core/SkCanvas.cpp \
+ third_party/skia/src/core/SkChunkAlloc.cpp \
+ third_party/skia/src/core/SkClipStack.cpp \
+ third_party/skia/src/core/SkColor.cpp \
+ third_party/skia/src/core/SkColorFilter.cpp \
+ third_party/skia/src/core/SkColorTable.cpp \
+ third_party/skia/src/core/SkComposeShader.cpp \
+ third_party/skia/src/core/SkConfig8888.cpp \
+ third_party/skia/src/core/SkConvolver.cpp \
+ third_party/skia/src/core/SkCordic.cpp \
+ third_party/skia/src/core/SkCubicClipper.cpp \
+ third_party/skia/src/core/SkData.cpp \
+ third_party/skia/src/core/SkDataTable.cpp \
+ third_party/skia/src/core/SkDebug.cpp \
+ third_party/skia/src/core/SkDeque.cpp \
+ third_party/skia/src/core/SkDevice.cpp \
+ third_party/skia/src/core/SkDeviceLooper.cpp \
+ third_party/skia/src/core/SkDeviceProfile.cpp \
+ third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \
+ third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \
+ third_party/skia/src/core/SkDither.cpp \
+ third_party/skia/src/core/SkDraw.cpp \
+ third_party/skia/src/core/SkDrawLooper.cpp \
+ third_party/skia/src/core/SkEdgeBuilder.cpp \
+ third_party/skia/src/core/SkEdgeClipper.cpp \
+ third_party/skia/src/core/SkEdge.cpp \
+ third_party/skia/src/core/SkError.cpp \
+ third_party/skia/src/core/SkFilterProc.cpp \
+ third_party/skia/src/core/SkFilterShader.cpp \
+ third_party/skia/src/core/SkFlattenable.cpp \
+ third_party/skia/src/core/SkFlattenableBuffers.cpp \
+ third_party/skia/src/core/SkFlattenableSerialization.cpp \
+ third_party/skia/src/core/SkFloat.cpp \
+ third_party/skia/src/core/SkFloatBits.cpp \
+ third_party/skia/src/core/SkFontHost.cpp \
+ third_party/skia/src/core/SkFontDescriptor.cpp \
+ third_party/skia/src/core/SkFontStream.cpp \
+ third_party/skia/src/core/SkGeometry.cpp \
+ third_party/skia/src/core/SkGlyphCache.cpp \
+ third_party/skia/src/core/SkGraphics.cpp \
+ third_party/skia/src/core/SkInstCnt.cpp \
+ third_party/skia/src/core/SkImageFilter.cpp \
+ third_party/skia/src/core/SkImageFilterUtils.cpp \
+ third_party/skia/src/core/SkImageInfo.cpp \
+ third_party/skia/src/core/SkLineClipper.cpp \
+ third_party/skia/src/core/SkMallocPixelRef.cpp \
+ third_party/skia/src/core/SkMask.cpp \
+ third_party/skia/src/core/SkMaskFilter.cpp \
+ third_party/skia/src/core/SkMaskGamma.cpp \
+ third_party/skia/src/core/SkMath.cpp \
+ third_party/skia/src/core/SkMatrix.cpp \
+ third_party/skia/src/core/SkMetaData.cpp \
+ third_party/skia/src/core/SkMipMap.cpp \
+ third_party/skia/src/core/SkOrderedReadBuffer.cpp \
+ third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
+ third_party/skia/src/core/SkPackBits.cpp \
+ third_party/skia/src/core/SkPaint.cpp \
+ third_party/skia/src/core/SkPaintPriv.cpp \
+ third_party/skia/src/core/SkPath.cpp \
+ third_party/skia/src/core/SkPathEffect.cpp \
+ third_party/skia/src/core/SkPathHeap.cpp \
+ third_party/skia/src/core/SkPathMeasure.cpp \
+ third_party/skia/src/core/SkPathRef.cpp \
+ third_party/skia/src/core/SkPicture.cpp \
+ third_party/skia/src/core/SkPictureFlat.cpp \
+ third_party/skia/src/core/SkPicturePlayback.cpp \
+ third_party/skia/src/core/SkPictureRecord.cpp \
+ third_party/skia/src/core/SkPictureStateTree.cpp \
+ third_party/skia/src/core/SkPixelRef.cpp \
+ third_party/skia/src/core/SkPoint.cpp \
+ third_party/skia/src/core/SkProcSpriteBlitter.cpp \
+ third_party/skia/src/core/SkPtrRecorder.cpp \
+ third_party/skia/src/core/SkQuadClipper.cpp \
+ third_party/skia/src/core/SkRasterClip.cpp \
+ third_party/skia/src/core/SkRasterizer.cpp \
+ third_party/skia/src/core/SkRect.cpp \
+ third_party/skia/src/core/SkRefDict.cpp \
+ third_party/skia/src/core/SkRegion.cpp \
+ third_party/skia/src/core/SkRegion_path.cpp \
+ third_party/skia/src/core/SkRRect.cpp \
+ third_party/skia/src/core/SkRTree.cpp \
+ third_party/skia/src/core/SkScaledImageCache.cpp \
+ third_party/skia/src/core/SkScalar.cpp \
+ third_party/skia/src/core/SkScalerContext.cpp \
+ third_party/skia/src/core/SkScan.cpp \
+ third_party/skia/src/core/SkScan_AntiPath.cpp \
+ third_party/skia/src/core/SkScan_Antihair.cpp \
+ third_party/skia/src/core/SkScan_Hairline.cpp \
+ third_party/skia/src/core/SkScan_Path.cpp \
+ third_party/skia/src/core/SkShader.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkStream.cpp \
+ third_party/skia/src/core/SkString.cpp \
+ third_party/skia/src/core/SkStringUtils.cpp \
+ third_party/skia/src/core/SkStroke.cpp \
+ third_party/skia/src/core/SkStrokeRec.cpp \
+ third_party/skia/src/core/SkStrokerPriv.cpp \
+ third_party/skia/src/core/SkTileGrid.cpp \
+ third_party/skia/src/core/SkTileGridPicture.cpp \
+ third_party/skia/src/core/SkTLS.cpp \
+ third_party/skia/src/core/SkTSearch.cpp \
+ third_party/skia/src/core/SkTypeface.cpp \
+ third_party/skia/src/core/SkTypefaceCache.cpp \
+ third_party/skia/src/core/SkUnPreMultiply.cpp \
+ third_party/skia/src/core/SkUtils.cpp \
+ third_party/skia/src/core/SkValidatingReadBuffer.cpp \
+ third_party/skia/src/core/SkWriter32.cpp \
+ third_party/skia/src/core/SkXfermode.cpp \
+ third_party/skia/src/doc/SkDocument.cpp \
+ third_party/skia/src/image/SkDataPixelRef.cpp \
+ third_party/skia/src/image/SkImage.cpp \
+ third_party/skia/src/image/SkImagePriv.cpp \
+ third_party/skia/src/image/SkImage_Codec.cpp \
+ third_party/skia/src/image/SkImage_Picture.cpp \
+ third_party/skia/src/image/SkImage_Raster.cpp \
+ third_party/skia/src/image/SkSurface.cpp \
+ third_party/skia/src/image/SkSurface_Picture.cpp \
+ third_party/skia/src/image/SkSurface_Raster.cpp \
+ third_party/skia/src/pipe/SkGPipeRead.cpp \
+ third_party/skia/src/pipe/SkGPipeWrite.cpp \
+ third_party/skia/src/lazy/SkCachingPixelRef.cpp \
+ third_party/skia/src/pathops/SkAddIntersections.cpp \
+ third_party/skia/src/pathops/SkDCubicIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicToQuads.cpp \
+ third_party/skia/src/pathops/SkDLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadImplicit.cpp \
+ third_party/skia/src/pathops/SkDQuadIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \
+ third_party/skia/src/pathops/SkIntersections.cpp \
+ third_party/skia/src/pathops/SkOpAngle.cpp \
+ third_party/skia/src/pathops/SkOpContour.cpp \
+ third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \
+ third_party/skia/src/pathops/SkOpSegment.cpp \
+ third_party/skia/src/pathops/SkPathOpsBounds.cpp \
+ third_party/skia/src/pathops/SkPathOpsCommon.cpp \
+ third_party/skia/src/pathops/SkPathOpsCubic.cpp \
+ third_party/skia/src/pathops/SkPathOpsDebug.cpp \
+ third_party/skia/src/pathops/SkPathOpsLine.cpp \
+ third_party/skia/src/pathops/SkPathOpsOp.cpp \
+ third_party/skia/src/pathops/SkPathOpsPoint.cpp \
+ third_party/skia/src/pathops/SkPathOpsQuad.cpp \
+ third_party/skia/src/pathops/SkPathOpsRect.cpp \
+ third_party/skia/src/pathops/SkPathOpsSimplify.cpp \
+ third_party/skia/src/pathops/SkPathOpsTriangle.cpp \
+ third_party/skia/src/pathops/SkPathOpsTypes.cpp \
+ third_party/skia/src/pathops/SkPathWriter.cpp \
+ third_party/skia/src/pathops/SkQuarticRoot.cpp \
+ third_party/skia/src/pathops/SkReduceOrder.cpp \
+ third_party/skia/src/effects/Sk1DPathEffect.cpp \
+ third_party/skia/src/effects/Sk2DPathEffect.cpp \
+ third_party/skia/src/effects/SkArithmeticMode.cpp \
+ third_party/skia/src/effects/SkAvoidXfermode.cpp \
+ third_party/skia/src/effects/SkBicubicImageFilter.cpp \
+ third_party/skia/src/effects/SkBitmapAlphaThresholdShader.cpp \
+ third_party/skia/src/effects/SkBitmapSource.cpp \
+ third_party/skia/src/effects/SkBlurDrawLooper.cpp \
+ third_party/skia/src/effects/SkBlurMask.cpp \
+ third_party/skia/src/effects/SkBlurImageFilter.cpp \
+ third_party/skia/src/effects/SkBlurMaskFilter.cpp \
+ third_party/skia/src/effects/SkColorFilters.cpp \
+ third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
+ third_party/skia/src/effects/SkColorMatrix.cpp \
+ third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
+ third_party/skia/src/effects/SkCornerPathEffect.cpp \
+ third_party/skia/src/effects/SkDashPathEffect.cpp \
+ third_party/skia/src/effects/SkDiscretePathEffect.cpp \
+ third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+ third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
+ third_party/skia/src/effects/SkEmbossMask.cpp \
+ third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+ third_party/skia/src/effects/SkGpuBlurUtils.cpp \
+ third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
+ third_party/skia/src/effects/SkLayerDrawLooper.cpp \
+ third_party/skia/src/effects/SkLayerRasterizer.cpp \
+ third_party/skia/src/effects/SkLerpXfermode.cpp \
+ third_party/skia/src/effects/SkLightingImageFilter.cpp \
+ third_party/skia/src/effects/SkLumaColorFilter.cpp \
+ third_party/skia/src/effects/SkMagnifierImageFilter.cpp \
+ third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \
+ third_party/skia/src/effects/SkMergeImageFilter.cpp \
+ third_party/skia/src/effects/SkMorphologyImageFilter.cpp \
+ third_party/skia/src/effects/SkOffsetImageFilter.cpp \
+ third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \
+ third_party/skia/src/effects/SkPerlinNoiseShader.cpp \
+ third_party/skia/src/effects/SkPictureImageFilter.cpp \
+ third_party/skia/src/effects/SkPixelXorXfermode.cpp \
+ third_party/skia/src/effects/SkPorterDuff.cpp \
+ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \
+ third_party/skia/src/effects/SkStippleMaskFilter.cpp \
+ third_party/skia/src/effects/SkTableColorFilter.cpp \
+ third_party/skia/src/effects/SkTableMaskFilter.cpp \
+ third_party/skia/src/effects/SkTestImageFilters.cpp \
+ third_party/skia/src/effects/SkTileImageFilter.cpp \
+ third_party/skia/src/effects/SkTransparentShader.cpp \
+ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \
+ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \
+ third_party/skia/src/effects/gradients/SkClampRange.cpp \
+ third_party/skia/src/effects/gradients/SkGradientShader.cpp \
+ third_party/skia/src/effects/gradients/SkLinearGradient.cpp \
+ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \
+ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \
+ third_party/skia/src/pdf/SkPDFCatalog.cpp \
+ third_party/skia/src/pdf/SkPDFDevice.cpp \
+ third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \
+ third_party/skia/src/pdf/SkPDFDocument.cpp \
+ third_party/skia/src/pdf/SkPDFFont.cpp \
+ third_party/skia/src/pdf/SkPDFFormXObject.cpp \
+ third_party/skia/src/pdf/SkPDFGraphicState.cpp \
+ third_party/skia/src/pdf/SkPDFImage.cpp \
+ third_party/skia/src/pdf/SkPDFPage.cpp \
+ third_party/skia/src/pdf/SkPDFResourceDict.cpp \
+ third_party/skia/src/pdf/SkPDFShader.cpp \
+ third_party/skia/src/pdf/SkPDFStream.cpp \
+ third_party/skia/src/pdf/SkPDFTypes.cpp \
+ third_party/skia/src/pdf/SkPDFUtils.cpp \
+ third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \
+ third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \
+ third_party/skia/src/gpu/GrAARectRenderer.cpp \
+ third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \
+ third_party/skia/src/gpu/GrAllocPool.cpp \
+ third_party/skia/src/gpu/GrAtlas.cpp \
+ third_party/skia/src/gpu/GrBitmapTextContext.cpp \
+ third_party/skia/src/gpu/GrBlend.cpp \
+ third_party/skia/src/gpu/GrBufferAllocPool.cpp \
+ third_party/skia/src/gpu/GrCacheID.cpp \
+ third_party/skia/src/gpu/GrClipData.cpp \
+ third_party/skia/src/gpu/GrContext.cpp \
+ third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \
+ third_party/skia/src/gpu/GrDrawState.cpp \
+ third_party/skia/src/gpu/GrDrawTarget.cpp \
+ third_party/skia/src/gpu/GrEffect.cpp \
+ third_party/skia/src/gpu/GrClipMaskCache.cpp \
+ third_party/skia/src/gpu/GrClipMaskManager.cpp \
+ third_party/skia/src/gpu/GrGpu.cpp \
+ third_party/skia/src/gpu/GrGpuFactory.cpp \
+ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
+ third_party/skia/src/gpu/GrMemoryPool.cpp \
+ third_party/skia/src/gpu/GrOvalRenderer.cpp \
+ third_party/skia/src/gpu/GrPaint.cpp \
+ third_party/skia/src/gpu/GrPath.cpp \
+ third_party/skia/src/gpu/GrPathRendererChain.cpp \
+ third_party/skia/src/gpu/GrPathRenderer.cpp \
+ third_party/skia/src/gpu/GrPathUtils.cpp \
+ third_party/skia/src/gpu/GrRectanizer.cpp \
+ third_party/skia/src/gpu/GrRectanizer_skyline.cpp \
+ third_party/skia/src/gpu/GrRenderTarget.cpp \
+ third_party/skia/src/gpu/GrReducedClip.cpp \
+ third_party/skia/src/gpu/GrResource.cpp \
+ third_party/skia/src/gpu/GrResourceCache.cpp \
+ third_party/skia/src/gpu/GrStencil.cpp \
+ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \
+ third_party/skia/src/gpu/GrStencilBuffer.cpp \
+ third_party/skia/src/gpu/GrSWMaskHelper.cpp \
+ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \
+ third_party/skia/src/gpu/GrSurface.cpp \
+ third_party/skia/src/gpu/GrTextContext.cpp \
+ third_party/skia/src/gpu/GrTextStrike.cpp \
+ third_party/skia/src/gpu/GrTexture.cpp \
+ third_party/skia/src/gpu/GrTextureAccess.cpp \
+ third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBezierEffect.cpp \
+ third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \
+ third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrTextureDomain.cpp \
+ third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \
+ third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \
+ third_party/skia/src/gpu/gl/GrGLCaps.cpp \
+ third_party/skia/src/gpu/gl/GrGLContext.cpp \
+ third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLExtensions.cpp \
+ third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLPath.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgram.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \
+ third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \
+ third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \
+ third_party/skia/src/gpu/gl/GrGLSL.cpp \
+ third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLTexture.cpp \
+ third_party/skia/src/gpu/gl/GrGLUtil.cpp \
+ third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \
+ third_party/skia/src/gpu/SkGpuDevice.cpp \
+ third_party/skia/src/gpu/SkGr.cpp \
+ third_party/skia/src/gpu/SkGrFontScaler.cpp \
+ third_party/skia/src/gpu/SkGrPixelRef.cpp \
+ third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \
+ third_party/skia/src/image/SkImage_Gpu.cpp \
+ third_party/skia/src/image/SkSurface_Gpu.cpp \
+ third_party/skia/src/gpu/gl/SkGLContextHelper.cpp
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -m32 \
+ -mmmx \
+ -march=pentium4 \
+ -msse2 \
+ -mfpmath=sse \
+ -fuse-ld=gold \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -fno-stack-protector \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -g \
+ -fomit-frame-pointer \
+ -fdata-sections \
+ -ffunction-sections
+
+MY_DEFS_Debug := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+ '-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -m32 \
+ -mmmx \
+ -march=pentium4 \
+ -msse2 \
+ -mfpmath=sse \
+ -fuse-ld=gold \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -fno-stack-protector \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -fno-ident \
+ -fdata-sections \
+ -ffunction-sections \
+ -fomit-frame-pointer \
+ -fno-unwind-tables \
+ -fno-asynchronous-unwind-tables
+
+MY_DEFS_Release := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DNDEBUG' \
+ '-DNVALGRIND' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -m32 \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--fatal-warnings \
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
+ -Wl,-O1 \
+ -Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -m32 \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,-O1 \
+ -Wl,--as-needed \
+ -Wl,--gc-sections \
+ -Wl,--fatal-warnings \
+ -Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+ libstlport \
+ libdl
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: skia_skia_library_gyp
@@ -635,12 +713,4 @@
.PHONY: skia_library
skia_library: skia_skia_library_gyp
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
- $(hide) echo "Gyp timestamp: $@"
- $(hide) mkdir -p $(dir $@)
- $(hide) touch $@
+include $(BUILD_STATIC_LIBRARY)
diff --git a/skia/skia_library.target.linux-arm.mk b/skia/skia_library.target.linux-arm.mk
index f40c8d6..4af50c7 100644
--- a/skia/skia_library.target.linux-arm.mk
+++ b/skia/skia_library.target.linux-arm.mk
@@ -2,631 +2,712 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := GYP
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := skia_skia_library_gyp
-LOCAL_MODULE_STEM := skia_library
-LOCAL_MODULE_SUFFIX := .stamp
+LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
gyp_intermediate_dir := $(call local-intermediates-dir)
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
+GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
-### Rules for action "generate_skia_library_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
- @echo "Gyp action: Generating skia_library shim headers ($@)"
- $(hide)cd $(gyp_local_path)/skia; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios; python ../tools/generate_shim_headers/generate_shim_headers.py --headers-root ../third_party/skia/include --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target" animator/SkAnimator.h animator/SkAnimatorView.h config/SkUserConfig.h core/Sk64.h core/SkAdvancedTypefaceMetrics.h core/SkAnnotation.h core/SkBitmap.h core/SkBitmapDevice.h core/SkBlitRow.h core/SkBounder.h core/SkCanvas.h core/SkChecksum.h core/SkChunkAlloc.h core/SkClipStack.h core/SkColor.h core/SkColorFilter.h core/SkColorPriv.h core/SkColorShader.h core/SkColorTable.h core/SkComposeShader.h core/SkData.h core/SkDataTable.h core/SkDeque.h core/SkDevice.h core/SkDeviceProperties.h core/SkDither.h core/SkDocument.h core/SkDraw.h core/SkDrawFilter.h core/SkDrawLooper.h core/SkEmptyShader.h core/SkEndian.h core/SkError.h core/SkFixed.h core/SkFlate.h core/SkFlattenable.h core/SkFlattenableBuffers.h core/SkFlattenableSerialization.h core/SkFloatBits.h core/SkFloatingPoint.h core/SkFontHost.h core/SkFontLCDConfig.h core/SkGeometry.h core/SkGraphics.h core/SkImage.h core/SkImageDecoder.h core/SkImageEncoder.h core/SkImageFilter.h core/SkImageFilterUtils.h core/SkImageGenerator.h core/SkImageInfo.h core/SkInstCnt.h core/SkLineClipper.h core/SkMallocPixelRef.h core/SkMask.h core/SkMaskFilter.h core/SkMath.h core/SkMatrix.h core/SkMetaData.h core/SkOSFile.h core/SkPackBits.h core/SkPaint.h core/SkPaintOptionsAndroid.h core/SkPath.h core/SkPathEffect.h core/SkPathMeasure.h core/SkPathRef.h core/SkPicture.h core/SkPixelRef.h core/SkPoint.h core/SkPostConfig.h core/SkPreConfig.h core/SkRRect.h core/SkRasterizer.h core/SkReader32.h core/SkRect.h core/SkRefCnt.h core/SkRegion.h core/SkScalar.h core/SkShader.h core/SkSize.h core/SkStream.h core/SkString.h core/SkStringUtils.h core/SkStrokeRec.h core/SkSurface.h core/SkTArray.h core/SkTDArray.h core/SkTDStack.h core/SkTDict.h core/SkTInternalLList.h core/SkTLazy.h core/SkTRegistry.h core/SkTSearch.h core/SkTemplates.h core/SkThread.h core/SkThread_platform.h core/SkTileGridPicture.h core/SkTime.h core/SkTrace.h core/SkTypeface.h core/SkTypes.h core/SkUnPreMultiply.h core/SkUnitMapper.h core/SkUtils.h core/SkWeakRefCnt.h core/SkWriter32.h core/SkXfermode.h device/xps/SkConstexprMath.h device/xps/SkXPSDevice.h effects/Sk1DPathEffect.h effects/Sk2DPathEffect.h effects/SkArithmeticMode.h effects/SkAvoidXfermode.h effects/SkBicubicImageFilter.h effects/SkBitmapAlphaThresholdShader.h effects/SkBitmapSource.h effects/SkBlurDrawLooper.h effects/SkBlurImageFilter.h effects/SkBlurMaskFilter.h effects/SkColorFilterImageFilter.h effects/SkColorMatrix.h effects/SkColorMatrixFilter.h effects/SkComposeImageFilter.h effects/SkCornerPathEffect.h effects/SkDashPathEffect.h effects/SkDiscretePathEffect.h effects/SkDisplacementMapEffect.h effects/SkDrawExtraPathEffect.h effects/SkDropShadowImageFilter.h effects/SkEmbossMaskFilter.h effects/SkGradientShader.h effects/SkKernel33MaskFilter.h effects/SkLayerDrawLooper.h effects/SkLayerRasterizer.h effects/SkLerpXfermode.h effects/SkLightingImageFilter.h effects/SkLumaColorFilter.h effects/SkMagnifierImageFilter.h effects/SkMatrixConvolutionImageFilter.h effects/SkMergeImageFilter.h effects/SkMorphologyImageFilter.h effects/SkOffsetImageFilter.h effects/SkPaintFlagsDrawFilter.h effects/SkPerlinNoiseShader.h effects/SkPictureImageFilter.h effects/SkPixelXorXfermode.h effects/SkPorterDuff.h effects/SkRectShaderImageFilter.h effects/SkStippleMaskFilter.h effects/SkTableColorFilter.h effects/SkTableMaskFilter.h effects/SkTestImageFilters.h effects/SkTileImageFilter.h effects/SkTransparentShader.h effects/SkXfermodeImageFilter.h gpu/GrBackendEffectFactory.h gpu/GrBitmapTextContext.h gpu/GrClipData.h gpu/GrColor.h gpu/GrConfig.h gpu/GrContext.h gpu/GrContextFactory.h gpu/GrCoordTransform.h gpu/GrDistanceFieldTextContext.h gpu/GrDrawEffect.h gpu/GrEffect.h gpu/GrEffectStage.h gpu/GrEffectUnitTest.h gpu/GrFontScaler.h gpu/GrGlyph.h gpu/GrKey.h gpu/GrPaint.h gpu/GrPathRendererChain.h gpu/GrPoint.h gpu/GrRect.h gpu/GrRenderTarget.h gpu/GrResource.h gpu/GrSurface.h gpu/GrTBackendEffectFactory.h gpu/GrTextContext.h gpu/GrTexture.h gpu/GrTextureAccess.h gpu/GrTypes.h gpu/GrTypesPriv.h gpu/GrUserConfig.h gpu/SkGpuDevice.h gpu/SkGr.h gpu/SkGrPixelRef.h gpu/SkGrTexturePixelRef.h gpu/gl/GrGLConfig.h gpu/gl/GrGLConfig_chrome.h gpu/gl/GrGLExtensions.h gpu/gl/GrGLFunctions.h gpu/gl/GrGLInterface.h gpu/gl/SkANGLEGLContext.h gpu/gl/SkDebugGLContext.h gpu/gl/SkGLContextHelper.h gpu/gl/SkMesaGLContext.h gpu/gl/SkNativeGLContext.h gpu/gl/SkNullGLContext.h images/SkForceLinking.h images/SkImageRef.h images/SkImageRef_GlobalPool.h images/SkImages.h images/SkMovie.h images/SkPageFlipper.h pathops/SkPathOps.h pdf/SkPDFDevice.h pdf/SkPDFDocument.h pipe/SkGPipe.h ports/SkFontConfigInterface.h ports/SkFontMgr.h ports/SkFontStyle.h ports/SkHarfBuzzFont.h ports/SkTypeface_android.h ports/SkTypeface_mac.h ports/SkTypeface_win.h svg/SkSVGAttribute.h svg/SkSVGBase.h svg/SkSVGPaintState.h svg/SkSVGParser.h svg/SkSVGTypes.h text/SkTextLayout.h utils/SkBoundaryPatch.h utils/SkCamera.h utils/SkCanvasStateUtils.h utils/SkCondVar.h utils/SkCountdown.h utils/SkCubicInterval.h utils/SkCullPoints.h utils/SkDebugUtils.h utils/SkDeferredCanvas.h utils/SkDumpCanvas.h utils/SkFrontBufferedStream.h utils/SkInterpolator.h utils/SkJSON.h utils/SkJSONCPP.h utils/SkLayer.h utils/SkLua.h utils/SkLuaCanvas.h utils/SkMatrix44.h utils/SkMeshUtils.h utils/SkNWayCanvas.h utils/SkNinePatch.h utils/SkNullCanvas.h utils/SkParse.h utils/SkParsePaint.h utils/SkParsePath.h utils/SkPathUtils.h utils/SkPictureUtils.h utils/SkProxyCanvas.h utils/SkRTConf.h utils/SkRandom.h utils/SkRunnable.h utils/SkThreadPool.h utils/SkUnitMappers.h utils/SkWGL.h utils/ios/SkStream_NSData.h utils/mac/SkCGUtils.h utils/win/SkAutoCoInitialize.h utils/win/SkHRESULT.h utils/win/SkIStream.h utils/win/SkTScopedComPtr.h views/SkApplication.h views/SkBGViewArtist.h views/SkEvent.h views/SkEventSink.h views/SkKey.h views/SkOSMenu.h views/SkOSWindow_Android.h views/SkOSWindow_Mac.h views/SkOSWindow_NaCl.h views/SkOSWindow_SDL.h views/SkOSWindow_Unix.h views/SkOSWindow_Win.h views/SkOSWindow_iOS.h views/SkStackViewLayout.h views/SkSystemEventTypes.h views/SkTextBox.h views/SkTouchGesture.h views/SkView.h views/SkViewInflate.h views/SkWidget.h views/SkWindow.h views/android/AndroidKeyToSkKey.h views/animated/SkBorderView.h views/animated/SkImageView.h views/animated/SkProgressBarView.h views/animated/SkScrollBarView.h views/animated/SkWidgetViews.h views/unix/XkeysToSkKeys.h views/unix/keysym2ucs.h xml/SkBML_WXMLParser.h xml/SkBML_XMLParser.h xml/SkDOM.h xml/SkJS.h xml/SkXMLParser.h xml/SkXMLWriter.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+ third_party/skia/src/core/SkFlate.cpp \
+ third_party/skia/src/core/SkPaintOptionsAndroid.cpp \
+ third_party/skia/src/ports/SkImageDecoder_empty.cpp \
+ third_party/skia/src/images/SkScaledBitmapSampler.cpp \
+ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \
+ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \
+ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \
+ third_party/skia/src/ports/SkFontConfigParser_android.cpp \
+ third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \
+ third_party/skia/src/ports/SkOSFile_posix.cpp \
+ third_party/skia/src/ports/SkOSFile_stdio.cpp \
+ third_party/skia/src/ports/SkThread_pthread.cpp \
+ third_party/skia/src/ports/SkTime_Unix.cpp \
+ third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
+ third_party/skia/src/sfnt/SkOTUtils.cpp \
+ third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
+ third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
+ third_party/skia/src/utils/debugger/SkObjectParser.cpp \
+ third_party/skia/src/utils/SkBase64.cpp \
+ third_party/skia/src/utils/SkBitSet.cpp \
+ third_party/skia/src/utils/SkCanvasStack.cpp \
+ third_party/skia/src/utils/SkCanvasStateUtils.cpp \
+ third_party/skia/src/utils/SkDeferredCanvas.cpp \
+ third_party/skia/src/utils/SkMatrix44.cpp \
+ third_party/skia/src/utils/SkNullCanvas.cpp \
+ third_party/skia/src/utils/SkNWayCanvas.cpp \
+ third_party/skia/src/utils/SkPictureUtils.cpp \
+ third_party/skia/src/utils/SkProxyCanvas.cpp \
+ third_party/skia/src/utils/SkRTConf.cpp \
+ third_party/skia/src/core/Sk64.cpp \
+ third_party/skia/src/core/SkAAClip.cpp \
+ third_party/skia/src/core/SkAnnotation.cpp \
+ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \
+ third_party/skia/src/core/SkAlphaRuns.cpp \
+ third_party/skia/src/core/SkBBoxRecord.cpp \
+ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
+ third_party/skia/src/core/SkBitmap.cpp \
+ third_party/skia/src/core/SkBitmapDevice.cpp \
+ third_party/skia/src/core/SkBitmapFilter.cpp \
+ third_party/skia/src/core/SkBitmapHeap.cpp \
+ third_party/skia/src/core/SkBitmapProcShader.cpp \
+ third_party/skia/src/core/SkBitmapProcState.cpp \
+ third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
+ third_party/skia/src/core/SkBitmapScaler.cpp \
+ third_party/skia/src/core/SkBitmap_scroll.cpp \
+ third_party/skia/src/core/SkBlitMask_D32.cpp \
+ third_party/skia/src/core/SkBlitRow_D16.cpp \
+ third_party/skia/src/core/SkBlitRow_D32.cpp \
+ third_party/skia/src/core/SkBlitter.cpp \
+ third_party/skia/src/core/SkBlitter_A8.cpp \
+ third_party/skia/src/core/SkBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkBlitter_Sprite.cpp \
+ third_party/skia/src/core/SkBuffer.cpp \
+ third_party/skia/src/core/SkCanvas.cpp \
+ third_party/skia/src/core/SkChunkAlloc.cpp \
+ third_party/skia/src/core/SkClipStack.cpp \
+ third_party/skia/src/core/SkColor.cpp \
+ third_party/skia/src/core/SkColorFilter.cpp \
+ third_party/skia/src/core/SkColorTable.cpp \
+ third_party/skia/src/core/SkComposeShader.cpp \
+ third_party/skia/src/core/SkConfig8888.cpp \
+ third_party/skia/src/core/SkConvolver.cpp \
+ third_party/skia/src/core/SkCordic.cpp \
+ third_party/skia/src/core/SkCubicClipper.cpp \
+ third_party/skia/src/core/SkData.cpp \
+ third_party/skia/src/core/SkDataTable.cpp \
+ third_party/skia/src/core/SkDebug.cpp \
+ third_party/skia/src/core/SkDeque.cpp \
+ third_party/skia/src/core/SkDevice.cpp \
+ third_party/skia/src/core/SkDeviceLooper.cpp \
+ third_party/skia/src/core/SkDeviceProfile.cpp \
+ third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \
+ third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \
+ third_party/skia/src/core/SkDither.cpp \
+ third_party/skia/src/core/SkDraw.cpp \
+ third_party/skia/src/core/SkDrawLooper.cpp \
+ third_party/skia/src/core/SkEdgeBuilder.cpp \
+ third_party/skia/src/core/SkEdgeClipper.cpp \
+ third_party/skia/src/core/SkEdge.cpp \
+ third_party/skia/src/core/SkError.cpp \
+ third_party/skia/src/core/SkFilterProc.cpp \
+ third_party/skia/src/core/SkFilterShader.cpp \
+ third_party/skia/src/core/SkFlattenable.cpp \
+ third_party/skia/src/core/SkFlattenableBuffers.cpp \
+ third_party/skia/src/core/SkFlattenableSerialization.cpp \
+ third_party/skia/src/core/SkFloat.cpp \
+ third_party/skia/src/core/SkFloatBits.cpp \
+ third_party/skia/src/core/SkFontHost.cpp \
+ third_party/skia/src/core/SkFontDescriptor.cpp \
+ third_party/skia/src/core/SkFontStream.cpp \
+ third_party/skia/src/core/SkGeometry.cpp \
+ third_party/skia/src/core/SkGlyphCache.cpp \
+ third_party/skia/src/core/SkGraphics.cpp \
+ third_party/skia/src/core/SkInstCnt.cpp \
+ third_party/skia/src/core/SkImageFilter.cpp \
+ third_party/skia/src/core/SkImageFilterUtils.cpp \
+ third_party/skia/src/core/SkImageInfo.cpp \
+ third_party/skia/src/core/SkLineClipper.cpp \
+ third_party/skia/src/core/SkMallocPixelRef.cpp \
+ third_party/skia/src/core/SkMask.cpp \
+ third_party/skia/src/core/SkMaskFilter.cpp \
+ third_party/skia/src/core/SkMaskGamma.cpp \
+ third_party/skia/src/core/SkMath.cpp \
+ third_party/skia/src/core/SkMatrix.cpp \
+ third_party/skia/src/core/SkMetaData.cpp \
+ third_party/skia/src/core/SkMipMap.cpp \
+ third_party/skia/src/core/SkOrderedReadBuffer.cpp \
+ third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
+ third_party/skia/src/core/SkPackBits.cpp \
+ third_party/skia/src/core/SkPaint.cpp \
+ third_party/skia/src/core/SkPaintPriv.cpp \
+ third_party/skia/src/core/SkPath.cpp \
+ third_party/skia/src/core/SkPathEffect.cpp \
+ third_party/skia/src/core/SkPathHeap.cpp \
+ third_party/skia/src/core/SkPathMeasure.cpp \
+ third_party/skia/src/core/SkPathRef.cpp \
+ third_party/skia/src/core/SkPicture.cpp \
+ third_party/skia/src/core/SkPictureFlat.cpp \
+ third_party/skia/src/core/SkPicturePlayback.cpp \
+ third_party/skia/src/core/SkPictureRecord.cpp \
+ third_party/skia/src/core/SkPictureStateTree.cpp \
+ third_party/skia/src/core/SkPixelRef.cpp \
+ third_party/skia/src/core/SkPoint.cpp \
+ third_party/skia/src/core/SkProcSpriteBlitter.cpp \
+ third_party/skia/src/core/SkPtrRecorder.cpp \
+ third_party/skia/src/core/SkQuadClipper.cpp \
+ third_party/skia/src/core/SkRasterClip.cpp \
+ third_party/skia/src/core/SkRasterizer.cpp \
+ third_party/skia/src/core/SkRect.cpp \
+ third_party/skia/src/core/SkRefDict.cpp \
+ third_party/skia/src/core/SkRegion.cpp \
+ third_party/skia/src/core/SkRegion_path.cpp \
+ third_party/skia/src/core/SkRRect.cpp \
+ third_party/skia/src/core/SkRTree.cpp \
+ third_party/skia/src/core/SkScaledImageCache.cpp \
+ third_party/skia/src/core/SkScalar.cpp \
+ third_party/skia/src/core/SkScalerContext.cpp \
+ third_party/skia/src/core/SkScan.cpp \
+ third_party/skia/src/core/SkScan_AntiPath.cpp \
+ third_party/skia/src/core/SkScan_Antihair.cpp \
+ third_party/skia/src/core/SkScan_Hairline.cpp \
+ third_party/skia/src/core/SkScan_Path.cpp \
+ third_party/skia/src/core/SkShader.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkStream.cpp \
+ third_party/skia/src/core/SkString.cpp \
+ third_party/skia/src/core/SkStringUtils.cpp \
+ third_party/skia/src/core/SkStroke.cpp \
+ third_party/skia/src/core/SkStrokeRec.cpp \
+ third_party/skia/src/core/SkStrokerPriv.cpp \
+ third_party/skia/src/core/SkTileGrid.cpp \
+ third_party/skia/src/core/SkTileGridPicture.cpp \
+ third_party/skia/src/core/SkTLS.cpp \
+ third_party/skia/src/core/SkTSearch.cpp \
+ third_party/skia/src/core/SkTypeface.cpp \
+ third_party/skia/src/core/SkTypefaceCache.cpp \
+ third_party/skia/src/core/SkUnPreMultiply.cpp \
+ third_party/skia/src/core/SkUtils.cpp \
+ third_party/skia/src/core/SkValidatingReadBuffer.cpp \
+ third_party/skia/src/core/SkWriter32.cpp \
+ third_party/skia/src/core/SkXfermode.cpp \
+ third_party/skia/src/doc/SkDocument.cpp \
+ third_party/skia/src/image/SkDataPixelRef.cpp \
+ third_party/skia/src/image/SkImage.cpp \
+ third_party/skia/src/image/SkImagePriv.cpp \
+ third_party/skia/src/image/SkImage_Codec.cpp \
+ third_party/skia/src/image/SkImage_Picture.cpp \
+ third_party/skia/src/image/SkImage_Raster.cpp \
+ third_party/skia/src/image/SkSurface.cpp \
+ third_party/skia/src/image/SkSurface_Picture.cpp \
+ third_party/skia/src/image/SkSurface_Raster.cpp \
+ third_party/skia/src/pipe/SkGPipeRead.cpp \
+ third_party/skia/src/pipe/SkGPipeWrite.cpp \
+ third_party/skia/src/lazy/SkCachingPixelRef.cpp \
+ third_party/skia/src/pathops/SkAddIntersections.cpp \
+ third_party/skia/src/pathops/SkDCubicIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicToQuads.cpp \
+ third_party/skia/src/pathops/SkDLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadImplicit.cpp \
+ third_party/skia/src/pathops/SkDQuadIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \
+ third_party/skia/src/pathops/SkIntersections.cpp \
+ third_party/skia/src/pathops/SkOpAngle.cpp \
+ third_party/skia/src/pathops/SkOpContour.cpp \
+ third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \
+ third_party/skia/src/pathops/SkOpSegment.cpp \
+ third_party/skia/src/pathops/SkPathOpsBounds.cpp \
+ third_party/skia/src/pathops/SkPathOpsCommon.cpp \
+ third_party/skia/src/pathops/SkPathOpsCubic.cpp \
+ third_party/skia/src/pathops/SkPathOpsDebug.cpp \
+ third_party/skia/src/pathops/SkPathOpsLine.cpp \
+ third_party/skia/src/pathops/SkPathOpsOp.cpp \
+ third_party/skia/src/pathops/SkPathOpsPoint.cpp \
+ third_party/skia/src/pathops/SkPathOpsQuad.cpp \
+ third_party/skia/src/pathops/SkPathOpsRect.cpp \
+ third_party/skia/src/pathops/SkPathOpsSimplify.cpp \
+ third_party/skia/src/pathops/SkPathOpsTriangle.cpp \
+ third_party/skia/src/pathops/SkPathOpsTypes.cpp \
+ third_party/skia/src/pathops/SkPathWriter.cpp \
+ third_party/skia/src/pathops/SkQuarticRoot.cpp \
+ third_party/skia/src/pathops/SkReduceOrder.cpp \
+ third_party/skia/src/effects/Sk1DPathEffect.cpp \
+ third_party/skia/src/effects/Sk2DPathEffect.cpp \
+ third_party/skia/src/effects/SkArithmeticMode.cpp \
+ third_party/skia/src/effects/SkAvoidXfermode.cpp \
+ third_party/skia/src/effects/SkBicubicImageFilter.cpp \
+ third_party/skia/src/effects/SkBitmapAlphaThresholdShader.cpp \
+ third_party/skia/src/effects/SkBitmapSource.cpp \
+ third_party/skia/src/effects/SkBlurDrawLooper.cpp \
+ third_party/skia/src/effects/SkBlurMask.cpp \
+ third_party/skia/src/effects/SkBlurImageFilter.cpp \
+ third_party/skia/src/effects/SkBlurMaskFilter.cpp \
+ third_party/skia/src/effects/SkColorFilters.cpp \
+ third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
+ third_party/skia/src/effects/SkColorMatrix.cpp \
+ third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
+ third_party/skia/src/effects/SkCornerPathEffect.cpp \
+ third_party/skia/src/effects/SkDashPathEffect.cpp \
+ third_party/skia/src/effects/SkDiscretePathEffect.cpp \
+ third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+ third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
+ third_party/skia/src/effects/SkEmbossMask.cpp \
+ third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+ third_party/skia/src/effects/SkGpuBlurUtils.cpp \
+ third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
+ third_party/skia/src/effects/SkLayerDrawLooper.cpp \
+ third_party/skia/src/effects/SkLayerRasterizer.cpp \
+ third_party/skia/src/effects/SkLerpXfermode.cpp \
+ third_party/skia/src/effects/SkLightingImageFilter.cpp \
+ third_party/skia/src/effects/SkLumaColorFilter.cpp \
+ third_party/skia/src/effects/SkMagnifierImageFilter.cpp \
+ third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \
+ third_party/skia/src/effects/SkMergeImageFilter.cpp \
+ third_party/skia/src/effects/SkMorphologyImageFilter.cpp \
+ third_party/skia/src/effects/SkOffsetImageFilter.cpp \
+ third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \
+ third_party/skia/src/effects/SkPerlinNoiseShader.cpp \
+ third_party/skia/src/effects/SkPictureImageFilter.cpp \
+ third_party/skia/src/effects/SkPixelXorXfermode.cpp \
+ third_party/skia/src/effects/SkPorterDuff.cpp \
+ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \
+ third_party/skia/src/effects/SkStippleMaskFilter.cpp \
+ third_party/skia/src/effects/SkTableColorFilter.cpp \
+ third_party/skia/src/effects/SkTableMaskFilter.cpp \
+ third_party/skia/src/effects/SkTestImageFilters.cpp \
+ third_party/skia/src/effects/SkTileImageFilter.cpp \
+ third_party/skia/src/effects/SkTransparentShader.cpp \
+ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \
+ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \
+ third_party/skia/src/effects/gradients/SkClampRange.cpp \
+ third_party/skia/src/effects/gradients/SkGradientShader.cpp \
+ third_party/skia/src/effects/gradients/SkLinearGradient.cpp \
+ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \
+ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \
+ third_party/skia/src/pdf/SkPDFCatalog.cpp \
+ third_party/skia/src/pdf/SkPDFDevice.cpp \
+ third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \
+ third_party/skia/src/pdf/SkPDFDocument.cpp \
+ third_party/skia/src/pdf/SkPDFFont.cpp \
+ third_party/skia/src/pdf/SkPDFFormXObject.cpp \
+ third_party/skia/src/pdf/SkPDFGraphicState.cpp \
+ third_party/skia/src/pdf/SkPDFImage.cpp \
+ third_party/skia/src/pdf/SkPDFPage.cpp \
+ third_party/skia/src/pdf/SkPDFResourceDict.cpp \
+ third_party/skia/src/pdf/SkPDFShader.cpp \
+ third_party/skia/src/pdf/SkPDFStream.cpp \
+ third_party/skia/src/pdf/SkPDFTypes.cpp \
+ third_party/skia/src/pdf/SkPDFUtils.cpp \
+ third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \
+ third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \
+ third_party/skia/src/gpu/GrAARectRenderer.cpp \
+ third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \
+ third_party/skia/src/gpu/GrAllocPool.cpp \
+ third_party/skia/src/gpu/GrAtlas.cpp \
+ third_party/skia/src/gpu/GrBitmapTextContext.cpp \
+ third_party/skia/src/gpu/GrBlend.cpp \
+ third_party/skia/src/gpu/GrBufferAllocPool.cpp \
+ third_party/skia/src/gpu/GrCacheID.cpp \
+ third_party/skia/src/gpu/GrClipData.cpp \
+ third_party/skia/src/gpu/GrContext.cpp \
+ third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \
+ third_party/skia/src/gpu/GrDrawState.cpp \
+ third_party/skia/src/gpu/GrDrawTarget.cpp \
+ third_party/skia/src/gpu/GrEffect.cpp \
+ third_party/skia/src/gpu/GrClipMaskCache.cpp \
+ third_party/skia/src/gpu/GrClipMaskManager.cpp \
+ third_party/skia/src/gpu/GrGpu.cpp \
+ third_party/skia/src/gpu/GrGpuFactory.cpp \
+ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
+ third_party/skia/src/gpu/GrMemoryPool.cpp \
+ third_party/skia/src/gpu/GrOvalRenderer.cpp \
+ third_party/skia/src/gpu/GrPaint.cpp \
+ third_party/skia/src/gpu/GrPath.cpp \
+ third_party/skia/src/gpu/GrPathRendererChain.cpp \
+ third_party/skia/src/gpu/GrPathRenderer.cpp \
+ third_party/skia/src/gpu/GrPathUtils.cpp \
+ third_party/skia/src/gpu/GrRectanizer.cpp \
+ third_party/skia/src/gpu/GrRectanizer_skyline.cpp \
+ third_party/skia/src/gpu/GrRenderTarget.cpp \
+ third_party/skia/src/gpu/GrReducedClip.cpp \
+ third_party/skia/src/gpu/GrResource.cpp \
+ third_party/skia/src/gpu/GrResourceCache.cpp \
+ third_party/skia/src/gpu/GrStencil.cpp \
+ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \
+ third_party/skia/src/gpu/GrStencilBuffer.cpp \
+ third_party/skia/src/gpu/GrSWMaskHelper.cpp \
+ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \
+ third_party/skia/src/gpu/GrSurface.cpp \
+ third_party/skia/src/gpu/GrTextContext.cpp \
+ third_party/skia/src/gpu/GrTextStrike.cpp \
+ third_party/skia/src/gpu/GrTexture.cpp \
+ third_party/skia/src/gpu/GrTextureAccess.cpp \
+ third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBezierEffect.cpp \
+ third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \
+ third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrTextureDomain.cpp \
+ third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \
+ third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \
+ third_party/skia/src/gpu/gl/GrGLCaps.cpp \
+ third_party/skia/src/gpu/gl/GrGLContext.cpp \
+ third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLExtensions.cpp \
+ third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLPath.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgram.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \
+ third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \
+ third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \
+ third_party/skia/src/gpu/gl/GrGLSL.cpp \
+ third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLTexture.cpp \
+ third_party/skia/src/gpu/gl/GrGLUtil.cpp \
+ third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \
+ third_party/skia/src/gpu/SkGpuDevice.cpp \
+ third_party/skia/src/gpu/SkGr.cpp \
+ third_party/skia/src/gpu/SkGrFontScaler.cpp \
+ third_party/skia/src/gpu/SkGrPixelRef.cpp \
+ third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \
+ third_party/skia/src/image/SkImage_Gpu.cpp \
+ third_party/skia/src/image/SkSurface_Gpu.cpp \
+ third_party/skia/src/gpu/gl/SkGLContextHelper.cpp \
+ third_party/skia/src/core/SkUtilsArm.cpp
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -fno-tree-sra \
+ -fuse-ld=gold \
+ -Wno-psabi \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -g \
+ -fomit-frame-pointer \
+ -fdata-sections \
+ -ffunction-sections
+
+MY_DEFS_Debug := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+ '-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-abi \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -fno-tree-sra \
+ -fuse-ld=gold \
+ -Wno-psabi \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -fno-ident \
+ -fdata-sections \
+ -ffunction-sections \
+ -fomit-frame-pointer
+
+MY_DEFS_Release := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DNDEBUG' \
+ '-DNVALGRIND' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-abi \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -Wl,-z,relro \
+ -Wl,-z,now \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--icf=safe \
+ -Wl,--fatal-warnings \
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
+ -Wl,-O1 \
+ -Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -Wl,-z,relro \
+ -Wl,-z,now \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--icf=safe \
+ -Wl,-O1 \
+ -Wl,--as-needed \
+ -Wl,--gc-sections \
+ -Wl,--fatal-warnings \
+ -Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES := \
+ cpufeatures
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+ libstlport \
+ libdl
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: skia_skia_library_gyp
@@ -635,12 +716,4 @@
.PHONY: skia_library
skia_library: skia_skia_library_gyp
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
- $(hide) echo "Gyp timestamp: $@"
- $(hide) mkdir -p $(dir $@)
- $(hide) touch $@
+include $(BUILD_STATIC_LIBRARY)
diff --git a/skia/skia_library.target.linux-mips.mk b/skia/skia_library.target.linux-mips.mk
index f40c8d6..c6ad5d7 100644
--- a/skia/skia_library.target.linux-mips.mk
+++ b/skia/skia_library.target.linux-mips.mk
@@ -2,631 +2,704 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := GYP
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := skia_skia_library_gyp
-LOCAL_MODULE_STEM := skia_library
-LOCAL_MODULE_SUFFIX := .stamp
+LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
gyp_intermediate_dir := $(call local-intermediates-dir)
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
+GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
-### Rules for action "generate_skia_library_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
- @echo "Gyp action: Generating skia_library shim headers ($@)"
- $(hide)cd $(gyp_local_path)/skia; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios; python ../tools/generate_shim_headers/generate_shim_headers.py --headers-root ../third_party/skia/include --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target" animator/SkAnimator.h animator/SkAnimatorView.h config/SkUserConfig.h core/Sk64.h core/SkAdvancedTypefaceMetrics.h core/SkAnnotation.h core/SkBitmap.h core/SkBitmapDevice.h core/SkBlitRow.h core/SkBounder.h core/SkCanvas.h core/SkChecksum.h core/SkChunkAlloc.h core/SkClipStack.h core/SkColor.h core/SkColorFilter.h core/SkColorPriv.h core/SkColorShader.h core/SkColorTable.h core/SkComposeShader.h core/SkData.h core/SkDataTable.h core/SkDeque.h core/SkDevice.h core/SkDeviceProperties.h core/SkDither.h core/SkDocument.h core/SkDraw.h core/SkDrawFilter.h core/SkDrawLooper.h core/SkEmptyShader.h core/SkEndian.h core/SkError.h core/SkFixed.h core/SkFlate.h core/SkFlattenable.h core/SkFlattenableBuffers.h core/SkFlattenableSerialization.h core/SkFloatBits.h core/SkFloatingPoint.h core/SkFontHost.h core/SkFontLCDConfig.h core/SkGeometry.h core/SkGraphics.h core/SkImage.h core/SkImageDecoder.h core/SkImageEncoder.h core/SkImageFilter.h core/SkImageFilterUtils.h core/SkImageGenerator.h core/SkImageInfo.h core/SkInstCnt.h core/SkLineClipper.h core/SkMallocPixelRef.h core/SkMask.h core/SkMaskFilter.h core/SkMath.h core/SkMatrix.h core/SkMetaData.h core/SkOSFile.h core/SkPackBits.h core/SkPaint.h core/SkPaintOptionsAndroid.h core/SkPath.h core/SkPathEffect.h core/SkPathMeasure.h core/SkPathRef.h core/SkPicture.h core/SkPixelRef.h core/SkPoint.h core/SkPostConfig.h core/SkPreConfig.h core/SkRRect.h core/SkRasterizer.h core/SkReader32.h core/SkRect.h core/SkRefCnt.h core/SkRegion.h core/SkScalar.h core/SkShader.h core/SkSize.h core/SkStream.h core/SkString.h core/SkStringUtils.h core/SkStrokeRec.h core/SkSurface.h core/SkTArray.h core/SkTDArray.h core/SkTDStack.h core/SkTDict.h core/SkTInternalLList.h core/SkTLazy.h core/SkTRegistry.h core/SkTSearch.h core/SkTemplates.h core/SkThread.h core/SkThread_platform.h core/SkTileGridPicture.h core/SkTime.h core/SkTrace.h core/SkTypeface.h core/SkTypes.h core/SkUnPreMultiply.h core/SkUnitMapper.h core/SkUtils.h core/SkWeakRefCnt.h core/SkWriter32.h core/SkXfermode.h device/xps/SkConstexprMath.h device/xps/SkXPSDevice.h effects/Sk1DPathEffect.h effects/Sk2DPathEffect.h effects/SkArithmeticMode.h effects/SkAvoidXfermode.h effects/SkBicubicImageFilter.h effects/SkBitmapAlphaThresholdShader.h effects/SkBitmapSource.h effects/SkBlurDrawLooper.h effects/SkBlurImageFilter.h effects/SkBlurMaskFilter.h effects/SkColorFilterImageFilter.h effects/SkColorMatrix.h effects/SkColorMatrixFilter.h effects/SkComposeImageFilter.h effects/SkCornerPathEffect.h effects/SkDashPathEffect.h effects/SkDiscretePathEffect.h effects/SkDisplacementMapEffect.h effects/SkDrawExtraPathEffect.h effects/SkDropShadowImageFilter.h effects/SkEmbossMaskFilter.h effects/SkGradientShader.h effects/SkKernel33MaskFilter.h effects/SkLayerDrawLooper.h effects/SkLayerRasterizer.h effects/SkLerpXfermode.h effects/SkLightingImageFilter.h effects/SkLumaColorFilter.h effects/SkMagnifierImageFilter.h effects/SkMatrixConvolutionImageFilter.h effects/SkMergeImageFilter.h effects/SkMorphologyImageFilter.h effects/SkOffsetImageFilter.h effects/SkPaintFlagsDrawFilter.h effects/SkPerlinNoiseShader.h effects/SkPictureImageFilter.h effects/SkPixelXorXfermode.h effects/SkPorterDuff.h effects/SkRectShaderImageFilter.h effects/SkStippleMaskFilter.h effects/SkTableColorFilter.h effects/SkTableMaskFilter.h effects/SkTestImageFilters.h effects/SkTileImageFilter.h effects/SkTransparentShader.h effects/SkXfermodeImageFilter.h gpu/GrBackendEffectFactory.h gpu/GrBitmapTextContext.h gpu/GrClipData.h gpu/GrColor.h gpu/GrConfig.h gpu/GrContext.h gpu/GrContextFactory.h gpu/GrCoordTransform.h gpu/GrDistanceFieldTextContext.h gpu/GrDrawEffect.h gpu/GrEffect.h gpu/GrEffectStage.h gpu/GrEffectUnitTest.h gpu/GrFontScaler.h gpu/GrGlyph.h gpu/GrKey.h gpu/GrPaint.h gpu/GrPathRendererChain.h gpu/GrPoint.h gpu/GrRect.h gpu/GrRenderTarget.h gpu/GrResource.h gpu/GrSurface.h gpu/GrTBackendEffectFactory.h gpu/GrTextContext.h gpu/GrTexture.h gpu/GrTextureAccess.h gpu/GrTypes.h gpu/GrTypesPriv.h gpu/GrUserConfig.h gpu/SkGpuDevice.h gpu/SkGr.h gpu/SkGrPixelRef.h gpu/SkGrTexturePixelRef.h gpu/gl/GrGLConfig.h gpu/gl/GrGLConfig_chrome.h gpu/gl/GrGLExtensions.h gpu/gl/GrGLFunctions.h gpu/gl/GrGLInterface.h gpu/gl/SkANGLEGLContext.h gpu/gl/SkDebugGLContext.h gpu/gl/SkGLContextHelper.h gpu/gl/SkMesaGLContext.h gpu/gl/SkNativeGLContext.h gpu/gl/SkNullGLContext.h images/SkForceLinking.h images/SkImageRef.h images/SkImageRef_GlobalPool.h images/SkImages.h images/SkMovie.h images/SkPageFlipper.h pathops/SkPathOps.h pdf/SkPDFDevice.h pdf/SkPDFDocument.h pipe/SkGPipe.h ports/SkFontConfigInterface.h ports/SkFontMgr.h ports/SkFontStyle.h ports/SkHarfBuzzFont.h ports/SkTypeface_android.h ports/SkTypeface_mac.h ports/SkTypeface_win.h svg/SkSVGAttribute.h svg/SkSVGBase.h svg/SkSVGPaintState.h svg/SkSVGParser.h svg/SkSVGTypes.h text/SkTextLayout.h utils/SkBoundaryPatch.h utils/SkCamera.h utils/SkCanvasStateUtils.h utils/SkCondVar.h utils/SkCountdown.h utils/SkCubicInterval.h utils/SkCullPoints.h utils/SkDebugUtils.h utils/SkDeferredCanvas.h utils/SkDumpCanvas.h utils/SkFrontBufferedStream.h utils/SkInterpolator.h utils/SkJSON.h utils/SkJSONCPP.h utils/SkLayer.h utils/SkLua.h utils/SkLuaCanvas.h utils/SkMatrix44.h utils/SkMeshUtils.h utils/SkNWayCanvas.h utils/SkNinePatch.h utils/SkNullCanvas.h utils/SkParse.h utils/SkParsePaint.h utils/SkParsePath.h utils/SkPathUtils.h utils/SkPictureUtils.h utils/SkProxyCanvas.h utils/SkRTConf.h utils/SkRandom.h utils/SkRunnable.h utils/SkThreadPool.h utils/SkUnitMappers.h utils/SkWGL.h utils/ios/SkStream_NSData.h utils/mac/SkCGUtils.h utils/win/SkAutoCoInitialize.h utils/win/SkHRESULT.h utils/win/SkIStream.h utils/win/SkTScopedComPtr.h views/SkApplication.h views/SkBGViewArtist.h views/SkEvent.h views/SkEventSink.h views/SkKey.h views/SkOSMenu.h views/SkOSWindow_Android.h views/SkOSWindow_Mac.h views/SkOSWindow_NaCl.h views/SkOSWindow_SDL.h views/SkOSWindow_Unix.h views/SkOSWindow_Win.h views/SkOSWindow_iOS.h views/SkStackViewLayout.h views/SkSystemEventTypes.h views/SkTextBox.h views/SkTouchGesture.h views/SkView.h views/SkViewInflate.h views/SkWidget.h views/SkWindow.h views/android/AndroidKeyToSkKey.h views/animated/SkBorderView.h views/animated/SkImageView.h views/animated/SkProgressBarView.h views/animated/SkScrollBarView.h views/animated/SkWidgetViews.h views/unix/XkeysToSkKeys.h views/unix/keysym2ucs.h xml/SkBML_WXMLParser.h xml/SkBML_XMLParser.h xml/SkDOM.h xml/SkJS.h xml/SkXMLParser.h xml/SkXMLWriter.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+ third_party/skia/src/core/SkFlate.cpp \
+ third_party/skia/src/core/SkPaintOptionsAndroid.cpp \
+ third_party/skia/src/ports/SkImageDecoder_empty.cpp \
+ third_party/skia/src/images/SkScaledBitmapSampler.cpp \
+ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \
+ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \
+ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \
+ third_party/skia/src/ports/SkFontConfigParser_android.cpp \
+ third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \
+ third_party/skia/src/ports/SkOSFile_posix.cpp \
+ third_party/skia/src/ports/SkOSFile_stdio.cpp \
+ third_party/skia/src/ports/SkThread_pthread.cpp \
+ third_party/skia/src/ports/SkTime_Unix.cpp \
+ third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
+ third_party/skia/src/sfnt/SkOTUtils.cpp \
+ third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
+ third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
+ third_party/skia/src/utils/debugger/SkObjectParser.cpp \
+ third_party/skia/src/utils/SkBase64.cpp \
+ third_party/skia/src/utils/SkBitSet.cpp \
+ third_party/skia/src/utils/SkCanvasStack.cpp \
+ third_party/skia/src/utils/SkCanvasStateUtils.cpp \
+ third_party/skia/src/utils/SkDeferredCanvas.cpp \
+ third_party/skia/src/utils/SkMatrix44.cpp \
+ third_party/skia/src/utils/SkNullCanvas.cpp \
+ third_party/skia/src/utils/SkNWayCanvas.cpp \
+ third_party/skia/src/utils/SkPictureUtils.cpp \
+ third_party/skia/src/utils/SkProxyCanvas.cpp \
+ third_party/skia/src/utils/SkRTConf.cpp \
+ third_party/skia/src/core/Sk64.cpp \
+ third_party/skia/src/core/SkAAClip.cpp \
+ third_party/skia/src/core/SkAnnotation.cpp \
+ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \
+ third_party/skia/src/core/SkAlphaRuns.cpp \
+ third_party/skia/src/core/SkBBoxRecord.cpp \
+ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
+ third_party/skia/src/core/SkBitmap.cpp \
+ third_party/skia/src/core/SkBitmapDevice.cpp \
+ third_party/skia/src/core/SkBitmapFilter.cpp \
+ third_party/skia/src/core/SkBitmapHeap.cpp \
+ third_party/skia/src/core/SkBitmapProcShader.cpp \
+ third_party/skia/src/core/SkBitmapProcState.cpp \
+ third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
+ third_party/skia/src/core/SkBitmapScaler.cpp \
+ third_party/skia/src/core/SkBitmap_scroll.cpp \
+ third_party/skia/src/core/SkBlitMask_D32.cpp \
+ third_party/skia/src/core/SkBlitRow_D16.cpp \
+ third_party/skia/src/core/SkBlitRow_D32.cpp \
+ third_party/skia/src/core/SkBlitter.cpp \
+ third_party/skia/src/core/SkBlitter_A8.cpp \
+ third_party/skia/src/core/SkBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkBlitter_Sprite.cpp \
+ third_party/skia/src/core/SkBuffer.cpp \
+ third_party/skia/src/core/SkCanvas.cpp \
+ third_party/skia/src/core/SkChunkAlloc.cpp \
+ third_party/skia/src/core/SkClipStack.cpp \
+ third_party/skia/src/core/SkColor.cpp \
+ third_party/skia/src/core/SkColorFilter.cpp \
+ third_party/skia/src/core/SkColorTable.cpp \
+ third_party/skia/src/core/SkComposeShader.cpp \
+ third_party/skia/src/core/SkConfig8888.cpp \
+ third_party/skia/src/core/SkConvolver.cpp \
+ third_party/skia/src/core/SkCordic.cpp \
+ third_party/skia/src/core/SkCubicClipper.cpp \
+ third_party/skia/src/core/SkData.cpp \
+ third_party/skia/src/core/SkDataTable.cpp \
+ third_party/skia/src/core/SkDebug.cpp \
+ third_party/skia/src/core/SkDeque.cpp \
+ third_party/skia/src/core/SkDevice.cpp \
+ third_party/skia/src/core/SkDeviceLooper.cpp \
+ third_party/skia/src/core/SkDeviceProfile.cpp \
+ third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \
+ third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \
+ third_party/skia/src/core/SkDither.cpp \
+ third_party/skia/src/core/SkDraw.cpp \
+ third_party/skia/src/core/SkDrawLooper.cpp \
+ third_party/skia/src/core/SkEdgeBuilder.cpp \
+ third_party/skia/src/core/SkEdgeClipper.cpp \
+ third_party/skia/src/core/SkEdge.cpp \
+ third_party/skia/src/core/SkError.cpp \
+ third_party/skia/src/core/SkFilterProc.cpp \
+ third_party/skia/src/core/SkFilterShader.cpp \
+ third_party/skia/src/core/SkFlattenable.cpp \
+ third_party/skia/src/core/SkFlattenableBuffers.cpp \
+ third_party/skia/src/core/SkFlattenableSerialization.cpp \
+ third_party/skia/src/core/SkFloat.cpp \
+ third_party/skia/src/core/SkFloatBits.cpp \
+ third_party/skia/src/core/SkFontHost.cpp \
+ third_party/skia/src/core/SkFontDescriptor.cpp \
+ third_party/skia/src/core/SkFontStream.cpp \
+ third_party/skia/src/core/SkGeometry.cpp \
+ third_party/skia/src/core/SkGlyphCache.cpp \
+ third_party/skia/src/core/SkGraphics.cpp \
+ third_party/skia/src/core/SkInstCnt.cpp \
+ third_party/skia/src/core/SkImageFilter.cpp \
+ third_party/skia/src/core/SkImageFilterUtils.cpp \
+ third_party/skia/src/core/SkImageInfo.cpp \
+ third_party/skia/src/core/SkLineClipper.cpp \
+ third_party/skia/src/core/SkMallocPixelRef.cpp \
+ third_party/skia/src/core/SkMask.cpp \
+ third_party/skia/src/core/SkMaskFilter.cpp \
+ third_party/skia/src/core/SkMaskGamma.cpp \
+ third_party/skia/src/core/SkMath.cpp \
+ third_party/skia/src/core/SkMatrix.cpp \
+ third_party/skia/src/core/SkMetaData.cpp \
+ third_party/skia/src/core/SkMipMap.cpp \
+ third_party/skia/src/core/SkOrderedReadBuffer.cpp \
+ third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
+ third_party/skia/src/core/SkPackBits.cpp \
+ third_party/skia/src/core/SkPaint.cpp \
+ third_party/skia/src/core/SkPaintPriv.cpp \
+ third_party/skia/src/core/SkPath.cpp \
+ third_party/skia/src/core/SkPathEffect.cpp \
+ third_party/skia/src/core/SkPathHeap.cpp \
+ third_party/skia/src/core/SkPathMeasure.cpp \
+ third_party/skia/src/core/SkPathRef.cpp \
+ third_party/skia/src/core/SkPicture.cpp \
+ third_party/skia/src/core/SkPictureFlat.cpp \
+ third_party/skia/src/core/SkPicturePlayback.cpp \
+ third_party/skia/src/core/SkPictureRecord.cpp \
+ third_party/skia/src/core/SkPictureStateTree.cpp \
+ third_party/skia/src/core/SkPixelRef.cpp \
+ third_party/skia/src/core/SkPoint.cpp \
+ third_party/skia/src/core/SkProcSpriteBlitter.cpp \
+ third_party/skia/src/core/SkPtrRecorder.cpp \
+ third_party/skia/src/core/SkQuadClipper.cpp \
+ third_party/skia/src/core/SkRasterClip.cpp \
+ third_party/skia/src/core/SkRasterizer.cpp \
+ third_party/skia/src/core/SkRect.cpp \
+ third_party/skia/src/core/SkRefDict.cpp \
+ third_party/skia/src/core/SkRegion.cpp \
+ third_party/skia/src/core/SkRegion_path.cpp \
+ third_party/skia/src/core/SkRRect.cpp \
+ third_party/skia/src/core/SkRTree.cpp \
+ third_party/skia/src/core/SkScaledImageCache.cpp \
+ third_party/skia/src/core/SkScalar.cpp \
+ third_party/skia/src/core/SkScalerContext.cpp \
+ third_party/skia/src/core/SkScan.cpp \
+ third_party/skia/src/core/SkScan_AntiPath.cpp \
+ third_party/skia/src/core/SkScan_Antihair.cpp \
+ third_party/skia/src/core/SkScan_Hairline.cpp \
+ third_party/skia/src/core/SkScan_Path.cpp \
+ third_party/skia/src/core/SkShader.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkStream.cpp \
+ third_party/skia/src/core/SkString.cpp \
+ third_party/skia/src/core/SkStringUtils.cpp \
+ third_party/skia/src/core/SkStroke.cpp \
+ third_party/skia/src/core/SkStrokeRec.cpp \
+ third_party/skia/src/core/SkStrokerPriv.cpp \
+ third_party/skia/src/core/SkTileGrid.cpp \
+ third_party/skia/src/core/SkTileGridPicture.cpp \
+ third_party/skia/src/core/SkTLS.cpp \
+ third_party/skia/src/core/SkTSearch.cpp \
+ third_party/skia/src/core/SkTypeface.cpp \
+ third_party/skia/src/core/SkTypefaceCache.cpp \
+ third_party/skia/src/core/SkUnPreMultiply.cpp \
+ third_party/skia/src/core/SkUtils.cpp \
+ third_party/skia/src/core/SkValidatingReadBuffer.cpp \
+ third_party/skia/src/core/SkWriter32.cpp \
+ third_party/skia/src/core/SkXfermode.cpp \
+ third_party/skia/src/doc/SkDocument.cpp \
+ third_party/skia/src/image/SkDataPixelRef.cpp \
+ third_party/skia/src/image/SkImage.cpp \
+ third_party/skia/src/image/SkImagePriv.cpp \
+ third_party/skia/src/image/SkImage_Codec.cpp \
+ third_party/skia/src/image/SkImage_Picture.cpp \
+ third_party/skia/src/image/SkImage_Raster.cpp \
+ third_party/skia/src/image/SkSurface.cpp \
+ third_party/skia/src/image/SkSurface_Picture.cpp \
+ third_party/skia/src/image/SkSurface_Raster.cpp \
+ third_party/skia/src/pipe/SkGPipeRead.cpp \
+ third_party/skia/src/pipe/SkGPipeWrite.cpp \
+ third_party/skia/src/lazy/SkCachingPixelRef.cpp \
+ third_party/skia/src/pathops/SkAddIntersections.cpp \
+ third_party/skia/src/pathops/SkDCubicIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicToQuads.cpp \
+ third_party/skia/src/pathops/SkDLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadImplicit.cpp \
+ third_party/skia/src/pathops/SkDQuadIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \
+ third_party/skia/src/pathops/SkIntersections.cpp \
+ third_party/skia/src/pathops/SkOpAngle.cpp \
+ third_party/skia/src/pathops/SkOpContour.cpp \
+ third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \
+ third_party/skia/src/pathops/SkOpSegment.cpp \
+ third_party/skia/src/pathops/SkPathOpsBounds.cpp \
+ third_party/skia/src/pathops/SkPathOpsCommon.cpp \
+ third_party/skia/src/pathops/SkPathOpsCubic.cpp \
+ third_party/skia/src/pathops/SkPathOpsDebug.cpp \
+ third_party/skia/src/pathops/SkPathOpsLine.cpp \
+ third_party/skia/src/pathops/SkPathOpsOp.cpp \
+ third_party/skia/src/pathops/SkPathOpsPoint.cpp \
+ third_party/skia/src/pathops/SkPathOpsQuad.cpp \
+ third_party/skia/src/pathops/SkPathOpsRect.cpp \
+ third_party/skia/src/pathops/SkPathOpsSimplify.cpp \
+ third_party/skia/src/pathops/SkPathOpsTriangle.cpp \
+ third_party/skia/src/pathops/SkPathOpsTypes.cpp \
+ third_party/skia/src/pathops/SkPathWriter.cpp \
+ third_party/skia/src/pathops/SkQuarticRoot.cpp \
+ third_party/skia/src/pathops/SkReduceOrder.cpp \
+ third_party/skia/src/effects/Sk1DPathEffect.cpp \
+ third_party/skia/src/effects/Sk2DPathEffect.cpp \
+ third_party/skia/src/effects/SkArithmeticMode.cpp \
+ third_party/skia/src/effects/SkAvoidXfermode.cpp \
+ third_party/skia/src/effects/SkBicubicImageFilter.cpp \
+ third_party/skia/src/effects/SkBitmapAlphaThresholdShader.cpp \
+ third_party/skia/src/effects/SkBitmapSource.cpp \
+ third_party/skia/src/effects/SkBlurDrawLooper.cpp \
+ third_party/skia/src/effects/SkBlurMask.cpp \
+ third_party/skia/src/effects/SkBlurImageFilter.cpp \
+ third_party/skia/src/effects/SkBlurMaskFilter.cpp \
+ third_party/skia/src/effects/SkColorFilters.cpp \
+ third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
+ third_party/skia/src/effects/SkColorMatrix.cpp \
+ third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
+ third_party/skia/src/effects/SkCornerPathEffect.cpp \
+ third_party/skia/src/effects/SkDashPathEffect.cpp \
+ third_party/skia/src/effects/SkDiscretePathEffect.cpp \
+ third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+ third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
+ third_party/skia/src/effects/SkEmbossMask.cpp \
+ third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+ third_party/skia/src/effects/SkGpuBlurUtils.cpp \
+ third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
+ third_party/skia/src/effects/SkLayerDrawLooper.cpp \
+ third_party/skia/src/effects/SkLayerRasterizer.cpp \
+ third_party/skia/src/effects/SkLerpXfermode.cpp \
+ third_party/skia/src/effects/SkLightingImageFilter.cpp \
+ third_party/skia/src/effects/SkLumaColorFilter.cpp \
+ third_party/skia/src/effects/SkMagnifierImageFilter.cpp \
+ third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \
+ third_party/skia/src/effects/SkMergeImageFilter.cpp \
+ third_party/skia/src/effects/SkMorphologyImageFilter.cpp \
+ third_party/skia/src/effects/SkOffsetImageFilter.cpp \
+ third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \
+ third_party/skia/src/effects/SkPerlinNoiseShader.cpp \
+ third_party/skia/src/effects/SkPictureImageFilter.cpp \
+ third_party/skia/src/effects/SkPixelXorXfermode.cpp \
+ third_party/skia/src/effects/SkPorterDuff.cpp \
+ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \
+ third_party/skia/src/effects/SkStippleMaskFilter.cpp \
+ third_party/skia/src/effects/SkTableColorFilter.cpp \
+ third_party/skia/src/effects/SkTableMaskFilter.cpp \
+ third_party/skia/src/effects/SkTestImageFilters.cpp \
+ third_party/skia/src/effects/SkTileImageFilter.cpp \
+ third_party/skia/src/effects/SkTransparentShader.cpp \
+ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \
+ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \
+ third_party/skia/src/effects/gradients/SkClampRange.cpp \
+ third_party/skia/src/effects/gradients/SkGradientShader.cpp \
+ third_party/skia/src/effects/gradients/SkLinearGradient.cpp \
+ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \
+ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \
+ third_party/skia/src/pdf/SkPDFCatalog.cpp \
+ third_party/skia/src/pdf/SkPDFDevice.cpp \
+ third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \
+ third_party/skia/src/pdf/SkPDFDocument.cpp \
+ third_party/skia/src/pdf/SkPDFFont.cpp \
+ third_party/skia/src/pdf/SkPDFFormXObject.cpp \
+ third_party/skia/src/pdf/SkPDFGraphicState.cpp \
+ third_party/skia/src/pdf/SkPDFImage.cpp \
+ third_party/skia/src/pdf/SkPDFPage.cpp \
+ third_party/skia/src/pdf/SkPDFResourceDict.cpp \
+ third_party/skia/src/pdf/SkPDFShader.cpp \
+ third_party/skia/src/pdf/SkPDFStream.cpp \
+ third_party/skia/src/pdf/SkPDFTypes.cpp \
+ third_party/skia/src/pdf/SkPDFUtils.cpp \
+ third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \
+ third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \
+ third_party/skia/src/gpu/GrAARectRenderer.cpp \
+ third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \
+ third_party/skia/src/gpu/GrAllocPool.cpp \
+ third_party/skia/src/gpu/GrAtlas.cpp \
+ third_party/skia/src/gpu/GrBitmapTextContext.cpp \
+ third_party/skia/src/gpu/GrBlend.cpp \
+ third_party/skia/src/gpu/GrBufferAllocPool.cpp \
+ third_party/skia/src/gpu/GrCacheID.cpp \
+ third_party/skia/src/gpu/GrClipData.cpp \
+ third_party/skia/src/gpu/GrContext.cpp \
+ third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \
+ third_party/skia/src/gpu/GrDrawState.cpp \
+ third_party/skia/src/gpu/GrDrawTarget.cpp \
+ third_party/skia/src/gpu/GrEffect.cpp \
+ third_party/skia/src/gpu/GrClipMaskCache.cpp \
+ third_party/skia/src/gpu/GrClipMaskManager.cpp \
+ third_party/skia/src/gpu/GrGpu.cpp \
+ third_party/skia/src/gpu/GrGpuFactory.cpp \
+ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
+ third_party/skia/src/gpu/GrMemoryPool.cpp \
+ third_party/skia/src/gpu/GrOvalRenderer.cpp \
+ third_party/skia/src/gpu/GrPaint.cpp \
+ third_party/skia/src/gpu/GrPath.cpp \
+ third_party/skia/src/gpu/GrPathRendererChain.cpp \
+ third_party/skia/src/gpu/GrPathRenderer.cpp \
+ third_party/skia/src/gpu/GrPathUtils.cpp \
+ third_party/skia/src/gpu/GrRectanizer.cpp \
+ third_party/skia/src/gpu/GrRectanizer_skyline.cpp \
+ third_party/skia/src/gpu/GrRenderTarget.cpp \
+ third_party/skia/src/gpu/GrReducedClip.cpp \
+ third_party/skia/src/gpu/GrResource.cpp \
+ third_party/skia/src/gpu/GrResourceCache.cpp \
+ third_party/skia/src/gpu/GrStencil.cpp \
+ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \
+ third_party/skia/src/gpu/GrStencilBuffer.cpp \
+ third_party/skia/src/gpu/GrSWMaskHelper.cpp \
+ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \
+ third_party/skia/src/gpu/GrSurface.cpp \
+ third_party/skia/src/gpu/GrTextContext.cpp \
+ third_party/skia/src/gpu/GrTextStrike.cpp \
+ third_party/skia/src/gpu/GrTexture.cpp \
+ third_party/skia/src/gpu/GrTextureAccess.cpp \
+ third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBezierEffect.cpp \
+ third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \
+ third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrTextureDomain.cpp \
+ third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \
+ third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \
+ third_party/skia/src/gpu/gl/GrGLCaps.cpp \
+ third_party/skia/src/gpu/gl/GrGLContext.cpp \
+ third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLExtensions.cpp \
+ third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLPath.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgram.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \
+ third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \
+ third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \
+ third_party/skia/src/gpu/gl/GrGLSL.cpp \
+ third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLTexture.cpp \
+ third_party/skia/src/gpu/gl/GrGLUtil.cpp \
+ third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \
+ third_party/skia/src/gpu/SkGpuDevice.cpp \
+ third_party/skia/src/gpu/SkGr.cpp \
+ third_party/skia/src/gpu/SkGrFontScaler.cpp \
+ third_party/skia/src/gpu/SkGrPixelRef.cpp \
+ third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \
+ third_party/skia/src/image/SkImage_Gpu.cpp \
+ third_party/skia/src/image/SkSurface_Gpu.cpp \
+ third_party/skia/src/gpu/gl/SkGLContextHelper.cpp
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -EL \
+ -mhard-float \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -g \
+ -fomit-frame-pointer \
+ -fdata-sections \
+ -ffunction-sections
+
+MY_DEFS_Debug := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+ '-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-uninitialized \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+ -fstack-protector \
+ --param=ssp-buffer-size=4 \
+ \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -EL \
+ -mhard-float \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fstack-protector \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -fno-ident \
+ -fdata-sections \
+ -ffunction-sections \
+ -fomit-frame-pointer
+
+MY_DEFS_Release := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DNDEBUG' \
+ '-DNVALGRIND' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-uninitialized \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -EL \
+ -Wl,--no-keep-memory \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--fatal-warnings \
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
+ -Wl,-O1 \
+ -Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -EL \
+ -Wl,--no-keep-memory \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,-O1 \
+ -Wl,--as-needed \
+ -Wl,--gc-sections \
+ -Wl,--fatal-warnings \
+ -Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+ libstlport \
+ libdl
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: skia_skia_library_gyp
@@ -635,12 +708,4 @@
.PHONY: skia_library
skia_library: skia_skia_library_gyp
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
- $(hide) echo "Gyp timestamp: $@"
- $(hide) mkdir -p $(dir $@)
- $(hide) touch $@
+include $(BUILD_STATIC_LIBRARY)
diff --git a/skia/skia_library.target.linux-x86.mk b/skia/skia_library.target.linux-x86.mk
index f40c8d6..c9af573 100644
--- a/skia/skia_library.target.linux-x86.mk
+++ b/skia/skia_library.target.linux-x86.mk
@@ -2,631 +2,709 @@
include $(CLEAR_VARS)
-LOCAL_MODULE_CLASS := GYP
+LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE := skia_skia_library_gyp
-LOCAL_MODULE_STEM := skia_library
-LOCAL_MODULE_SUFFIX := .stamp
+LOCAL_MODULE_SUFFIX := .a
LOCAL_MODULE_TAGS := optional
gyp_intermediate_dir := $(call local-intermediates-dir)
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
+GYP_TARGET_DEPENDENCIES := \
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \
+ $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp
-### Rules for action "generate_skia_library_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
- @echo "Gyp action: Generating skia_library shim headers ($@)"
- $(hide)cd $(gyp_local_path)/skia; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios; python ../tools/generate_shim_headers/generate_shim_headers.py --headers-root ../third_party/skia/include --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target" animator/SkAnimator.h animator/SkAnimatorView.h config/SkUserConfig.h core/Sk64.h core/SkAdvancedTypefaceMetrics.h core/SkAnnotation.h core/SkBitmap.h core/SkBitmapDevice.h core/SkBlitRow.h core/SkBounder.h core/SkCanvas.h core/SkChecksum.h core/SkChunkAlloc.h core/SkClipStack.h core/SkColor.h core/SkColorFilter.h core/SkColorPriv.h core/SkColorShader.h core/SkColorTable.h core/SkComposeShader.h core/SkData.h core/SkDataTable.h core/SkDeque.h core/SkDevice.h core/SkDeviceProperties.h core/SkDither.h core/SkDocument.h core/SkDraw.h core/SkDrawFilter.h core/SkDrawLooper.h core/SkEmptyShader.h core/SkEndian.h core/SkError.h core/SkFixed.h core/SkFlate.h core/SkFlattenable.h core/SkFlattenableBuffers.h core/SkFlattenableSerialization.h core/SkFloatBits.h core/SkFloatingPoint.h core/SkFontHost.h core/SkFontLCDConfig.h core/SkGeometry.h core/SkGraphics.h core/SkImage.h core/SkImageDecoder.h core/SkImageEncoder.h core/SkImageFilter.h core/SkImageFilterUtils.h core/SkImageGenerator.h core/SkImageInfo.h core/SkInstCnt.h core/SkLineClipper.h core/SkMallocPixelRef.h core/SkMask.h core/SkMaskFilter.h core/SkMath.h core/SkMatrix.h core/SkMetaData.h core/SkOSFile.h core/SkPackBits.h core/SkPaint.h core/SkPaintOptionsAndroid.h core/SkPath.h core/SkPathEffect.h core/SkPathMeasure.h core/SkPathRef.h core/SkPicture.h core/SkPixelRef.h core/SkPoint.h core/SkPostConfig.h core/SkPreConfig.h core/SkRRect.h core/SkRasterizer.h core/SkReader32.h core/SkRect.h core/SkRefCnt.h core/SkRegion.h core/SkScalar.h core/SkShader.h core/SkSize.h core/SkStream.h core/SkString.h core/SkStringUtils.h core/SkStrokeRec.h core/SkSurface.h core/SkTArray.h core/SkTDArray.h core/SkTDStack.h core/SkTDict.h core/SkTInternalLList.h core/SkTLazy.h core/SkTRegistry.h core/SkTSearch.h core/SkTemplates.h core/SkThread.h core/SkThread_platform.h core/SkTileGridPicture.h core/SkTime.h core/SkTrace.h core/SkTypeface.h core/SkTypes.h core/SkUnPreMultiply.h core/SkUnitMapper.h core/SkUtils.h core/SkWeakRefCnt.h core/SkWriter32.h core/SkXfermode.h device/xps/SkConstexprMath.h device/xps/SkXPSDevice.h effects/Sk1DPathEffect.h effects/Sk2DPathEffect.h effects/SkArithmeticMode.h effects/SkAvoidXfermode.h effects/SkBicubicImageFilter.h effects/SkBitmapAlphaThresholdShader.h effects/SkBitmapSource.h effects/SkBlurDrawLooper.h effects/SkBlurImageFilter.h effects/SkBlurMaskFilter.h effects/SkColorFilterImageFilter.h effects/SkColorMatrix.h effects/SkColorMatrixFilter.h effects/SkComposeImageFilter.h effects/SkCornerPathEffect.h effects/SkDashPathEffect.h effects/SkDiscretePathEffect.h effects/SkDisplacementMapEffect.h effects/SkDrawExtraPathEffect.h effects/SkDropShadowImageFilter.h effects/SkEmbossMaskFilter.h effects/SkGradientShader.h effects/SkKernel33MaskFilter.h effects/SkLayerDrawLooper.h effects/SkLayerRasterizer.h effects/SkLerpXfermode.h effects/SkLightingImageFilter.h effects/SkLumaColorFilter.h effects/SkMagnifierImageFilter.h effects/SkMatrixConvolutionImageFilter.h effects/SkMergeImageFilter.h effects/SkMorphologyImageFilter.h effects/SkOffsetImageFilter.h effects/SkPaintFlagsDrawFilter.h effects/SkPerlinNoiseShader.h effects/SkPictureImageFilter.h effects/SkPixelXorXfermode.h effects/SkPorterDuff.h effects/SkRectShaderImageFilter.h effects/SkStippleMaskFilter.h effects/SkTableColorFilter.h effects/SkTableMaskFilter.h effects/SkTestImageFilters.h effects/SkTileImageFilter.h effects/SkTransparentShader.h effects/SkXfermodeImageFilter.h gpu/GrBackendEffectFactory.h gpu/GrBitmapTextContext.h gpu/GrClipData.h gpu/GrColor.h gpu/GrConfig.h gpu/GrContext.h gpu/GrContextFactory.h gpu/GrCoordTransform.h gpu/GrDistanceFieldTextContext.h gpu/GrDrawEffect.h gpu/GrEffect.h gpu/GrEffectStage.h gpu/GrEffectUnitTest.h gpu/GrFontScaler.h gpu/GrGlyph.h gpu/GrKey.h gpu/GrPaint.h gpu/GrPathRendererChain.h gpu/GrPoint.h gpu/GrRect.h gpu/GrRenderTarget.h gpu/GrResource.h gpu/GrSurface.h gpu/GrTBackendEffectFactory.h gpu/GrTextContext.h gpu/GrTexture.h gpu/GrTextureAccess.h gpu/GrTypes.h gpu/GrTypesPriv.h gpu/GrUserConfig.h gpu/SkGpuDevice.h gpu/SkGr.h gpu/SkGrPixelRef.h gpu/SkGrTexturePixelRef.h gpu/gl/GrGLConfig.h gpu/gl/GrGLConfig_chrome.h gpu/gl/GrGLExtensions.h gpu/gl/GrGLFunctions.h gpu/gl/GrGLInterface.h gpu/gl/SkANGLEGLContext.h gpu/gl/SkDebugGLContext.h gpu/gl/SkGLContextHelper.h gpu/gl/SkMesaGLContext.h gpu/gl/SkNativeGLContext.h gpu/gl/SkNullGLContext.h images/SkForceLinking.h images/SkImageRef.h images/SkImageRef_GlobalPool.h images/SkImages.h images/SkMovie.h images/SkPageFlipper.h pathops/SkPathOps.h pdf/SkPDFDevice.h pdf/SkPDFDocument.h pipe/SkGPipe.h ports/SkFontConfigInterface.h ports/SkFontMgr.h ports/SkFontStyle.h ports/SkHarfBuzzFont.h ports/SkTypeface_android.h ports/SkTypeface_mac.h ports/SkTypeface_win.h svg/SkSVGAttribute.h svg/SkSVGBase.h svg/SkSVGPaintState.h svg/SkSVGParser.h svg/SkSVGTypes.h text/SkTextLayout.h utils/SkBoundaryPatch.h utils/SkCamera.h utils/SkCanvasStateUtils.h utils/SkCondVar.h utils/SkCountdown.h utils/SkCubicInterval.h utils/SkCullPoints.h utils/SkDebugUtils.h utils/SkDeferredCanvas.h utils/SkDumpCanvas.h utils/SkFrontBufferedStream.h utils/SkInterpolator.h utils/SkJSON.h utils/SkJSONCPP.h utils/SkLayer.h utils/SkLua.h utils/SkLuaCanvas.h utils/SkMatrix44.h utils/SkMeshUtils.h utils/SkNWayCanvas.h utils/SkNinePatch.h utils/SkNullCanvas.h utils/SkParse.h utils/SkParsePaint.h utils/SkParsePath.h utils/SkPathUtils.h utils/SkPictureUtils.h utils/SkProxyCanvas.h utils/SkRTConf.h utils/SkRandom.h utils/SkRunnable.h utils/SkThreadPool.h utils/SkUnitMappers.h utils/SkWGL.h utils/ios/SkStream_NSData.h utils/mac/SkCGUtils.h utils/win/SkAutoCoInitialize.h utils/win/SkHRESULT.h utils/win/SkIStream.h utils/win/SkTScopedComPtr.h views/SkApplication.h views/SkBGViewArtist.h views/SkEvent.h views/SkEventSink.h views/SkKey.h views/SkOSMenu.h views/SkOSWindow_Android.h views/SkOSWindow_Mac.h views/SkOSWindow_NaCl.h views/SkOSWindow_SDL.h views/SkOSWindow_Unix.h views/SkOSWindow_Win.h views/SkOSWindow_iOS.h views/SkStackViewLayout.h views/SkSystemEventTypes.h views/SkTextBox.h views/SkTouchGesture.h views/SkView.h views/SkViewInflate.h views/SkWidget.h views/SkWindow.h views/android/AndroidKeyToSkKey.h views/animated/SkBorderView.h views/animated/SkImageView.h views/animated/SkProgressBarView.h views/animated/SkScrollBarView.h views/animated/SkWidgetViews.h views/unix/XkeysToSkKeys.h views/unix/keysym2ucs.h xml/SkBML_WXMLParser.h xml/SkBML_XMLParser.h xml/SkDOM.h xml/SkJS.h xml/SkXMLParser.h xml/SkXMLWriter.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h: $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/animator/SkAnimatorView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/config/SkUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/Sk64.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAdvancedTypefaceMetrics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkAnnotation.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmap.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBitmapDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBlitRow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkBounder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChecksum.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkChunkAlloc.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkClipStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkColorTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkComposeShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDataTable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeque.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDeviceProperties.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDither.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDraw.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEmptyShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkEndian.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkError.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFixed.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableBuffers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFlattenableSerialization.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFloatingPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontHost.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkFontLCDConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGeometry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkGraphics.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageDecoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageEncoder.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageFilterUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageGenerator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkImageInfo.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkInstCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkLineClipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMallocPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMask.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkMetaData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkOSFile.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPackBits.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPaintOptionsAndroid.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathMeasure.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPathRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPostConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkPreConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkReader32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkRegion.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkScalar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkString.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStringUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkStrokeRec.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDArray.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDStack.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTDict.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTInternalLList.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTLazy.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTRegistry.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTSearch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTemplates.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkThread_platform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTileGridPicture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTime.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTrace.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypeface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnPreMultiply.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUnitMapper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWeakRefCnt.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkWriter32.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/core/SkXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkConstexprMath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/device/xps/SkXPSDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk1DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/Sk2DPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkArithmeticMode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkAvoidXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBicubicImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapAlphaThresholdShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBitmapSource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkBlurMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorFilterImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkColorMatrixFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkComposeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkCornerPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDashPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDiscretePathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDisplacementMapEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDrawExtraPathEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkDropShadowImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkEmbossMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkGradientShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkKernel33MaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerDrawLooper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLayerRasterizer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLerpXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLightingImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkLumaColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMagnifierImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMatrixConvolutionImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMergeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkMorphologyImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkOffsetImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPaintFlagsDrawFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPerlinNoiseShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPictureImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPixelXorXfermode.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkPorterDuff.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkRectShaderImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkStippleMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableColorFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTableMaskFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTestImageFilters.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTileImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkTransparentShader.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/effects/SkXfermodeImageFilter.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrBitmapTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrClipData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrColor.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrContextFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrCoordTransform.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDistanceFieldTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrDrawEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectStage.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrEffectUnitTest.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrFontScaler.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrGlyph.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPathRendererChain.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrPoint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRect.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrRenderTarget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrResource.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrSurface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTBackendEffectFactory.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTexture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTextureAccess.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrTypesPriv.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/GrUserConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGpuDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrPixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/SkGrTexturePixelRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLExtensions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLFunctions.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/GrGLInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkANGLEGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkDebugGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkGLContextHelper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkMesaGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNativeGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/gpu/gl/SkNullGLContext.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkForceLinking.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImageRef_GlobalPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkImages.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkMovie.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/images/SkPageFlipper.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pathops/SkPathOps.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDevice.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pdf/SkPDFDocument.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/pipe/SkGPipe.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontConfigInterface.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontMgr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkFontStyle.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkHarfBuzzFont.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/ports/SkTypeface_win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGAttribute.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGBase.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGPaintState.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/svg/SkSVGTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/text/SkTextLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkBoundaryPatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCamera.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCanvasStateUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCondVar.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCountdown.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCubicInterval.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkCullPoints.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDebugUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDeferredCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkDumpCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkFrontBufferedStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkInterpolator.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSON.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkJSONCPP.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLayer.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLua.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkLuaCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMatrix44.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkMeshUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNWayCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNinePatch.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkNullCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParse.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePaint.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkParsePath.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPathUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkPictureUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkProxyCanvas.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRTConf.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRandom.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkRunnable.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkThreadPool.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkUnitMappers.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/SkWGL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/ios/SkStream_NSData.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/mac/SkCGUtils.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkAutoCoInitialize.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkHRESULT.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkIStream.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/utils/win/SkTScopedComPtr.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkApplication.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkBGViewArtist.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEvent.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkEventSink.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSMenu.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Android.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Mac.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_NaCl.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_SDL.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Unix.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_Win.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkOSWindow_iOS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkStackViewLayout.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkSystemEventTypes.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTextBox.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkTouchGesture.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkViewInflate.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWidget.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/SkWindow.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/android/AndroidKeyToSkKey.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkBorderView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkImageView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkProgressBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkScrollBarView.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/animated/SkWidgetViews.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/XkeysToSkKeys.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/views/unix/keysym2ucs.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_WXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkBML_XMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkDOM.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkJS.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLParser.h \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target/third_party/skia/include/xml/SkXMLWriter.h
+GYP_GENERATED_OUTPUTS :=
# Make sure our deps and generated files are built first.
LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
+LOCAL_GENERATED_SOURCES :=
+
+GYP_COPIED_SOURCE_ORIGIN_DIRS :=
+
+LOCAL_SRC_FILES := \
+ third_party/skia/src/core/SkFlate.cpp \
+ third_party/skia/src/core/SkPaintOptionsAndroid.cpp \
+ third_party/skia/src/ports/SkImageDecoder_empty.cpp \
+ third_party/skia/src/images/SkScaledBitmapSampler.cpp \
+ third_party/skia/src/opts/opts_check_SSE2.cpp \
+ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \
+ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \
+ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType.cpp \
+ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \
+ third_party/skia/src/ports/SkFontConfigParser_android.cpp \
+ third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \
+ third_party/skia/src/ports/SkOSFile_posix.cpp \
+ third_party/skia/src/ports/SkOSFile_stdio.cpp \
+ third_party/skia/src/ports/SkThread_pthread.cpp \
+ third_party/skia/src/ports/SkTime_Unix.cpp \
+ third_party/skia/src/ports/SkTLS_pthread.cpp \
+ third_party/skia/src/sfnt/SkOTTable_name.cpp \
+ third_party/skia/src/sfnt/SkOTUtils.cpp \
+ third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \
+ third_party/skia/src/utils/debugger/SkDrawCommand.cpp \
+ third_party/skia/src/utils/debugger/SkObjectParser.cpp \
+ third_party/skia/src/utils/SkBase64.cpp \
+ third_party/skia/src/utils/SkBitSet.cpp \
+ third_party/skia/src/utils/SkCanvasStack.cpp \
+ third_party/skia/src/utils/SkCanvasStateUtils.cpp \
+ third_party/skia/src/utils/SkDeferredCanvas.cpp \
+ third_party/skia/src/utils/SkMatrix44.cpp \
+ third_party/skia/src/utils/SkNullCanvas.cpp \
+ third_party/skia/src/utils/SkNWayCanvas.cpp \
+ third_party/skia/src/utils/SkPictureUtils.cpp \
+ third_party/skia/src/utils/SkProxyCanvas.cpp \
+ third_party/skia/src/utils/SkRTConf.cpp \
+ third_party/skia/src/core/Sk64.cpp \
+ third_party/skia/src/core/SkAAClip.cpp \
+ third_party/skia/src/core/SkAnnotation.cpp \
+ third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \
+ third_party/skia/src/core/SkAlphaRuns.cpp \
+ third_party/skia/src/core/SkBBoxRecord.cpp \
+ third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \
+ third_party/skia/src/core/SkBitmap.cpp \
+ third_party/skia/src/core/SkBitmapDevice.cpp \
+ third_party/skia/src/core/SkBitmapFilter.cpp \
+ third_party/skia/src/core/SkBitmapHeap.cpp \
+ third_party/skia/src/core/SkBitmapProcShader.cpp \
+ third_party/skia/src/core/SkBitmapProcState.cpp \
+ third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \
+ third_party/skia/src/core/SkBitmapScaler.cpp \
+ third_party/skia/src/core/SkBitmap_scroll.cpp \
+ third_party/skia/src/core/SkBlitMask_D32.cpp \
+ third_party/skia/src/core/SkBlitRow_D16.cpp \
+ third_party/skia/src/core/SkBlitRow_D32.cpp \
+ third_party/skia/src/core/SkBlitter.cpp \
+ third_party/skia/src/core/SkBlitter_A8.cpp \
+ third_party/skia/src/core/SkBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkBlitter_Sprite.cpp \
+ third_party/skia/src/core/SkBuffer.cpp \
+ third_party/skia/src/core/SkCanvas.cpp \
+ third_party/skia/src/core/SkChunkAlloc.cpp \
+ third_party/skia/src/core/SkClipStack.cpp \
+ third_party/skia/src/core/SkColor.cpp \
+ third_party/skia/src/core/SkColorFilter.cpp \
+ third_party/skia/src/core/SkColorTable.cpp \
+ third_party/skia/src/core/SkComposeShader.cpp \
+ third_party/skia/src/core/SkConfig8888.cpp \
+ third_party/skia/src/core/SkConvolver.cpp \
+ third_party/skia/src/core/SkCordic.cpp \
+ third_party/skia/src/core/SkCubicClipper.cpp \
+ third_party/skia/src/core/SkData.cpp \
+ third_party/skia/src/core/SkDataTable.cpp \
+ third_party/skia/src/core/SkDebug.cpp \
+ third_party/skia/src/core/SkDeque.cpp \
+ third_party/skia/src/core/SkDevice.cpp \
+ third_party/skia/src/core/SkDeviceLooper.cpp \
+ third_party/skia/src/core/SkDeviceProfile.cpp \
+ third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \
+ third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \
+ third_party/skia/src/core/SkDither.cpp \
+ third_party/skia/src/core/SkDraw.cpp \
+ third_party/skia/src/core/SkDrawLooper.cpp \
+ third_party/skia/src/core/SkEdgeBuilder.cpp \
+ third_party/skia/src/core/SkEdgeClipper.cpp \
+ third_party/skia/src/core/SkEdge.cpp \
+ third_party/skia/src/core/SkError.cpp \
+ third_party/skia/src/core/SkFilterProc.cpp \
+ third_party/skia/src/core/SkFilterShader.cpp \
+ third_party/skia/src/core/SkFlattenable.cpp \
+ third_party/skia/src/core/SkFlattenableBuffers.cpp \
+ third_party/skia/src/core/SkFlattenableSerialization.cpp \
+ third_party/skia/src/core/SkFloat.cpp \
+ third_party/skia/src/core/SkFloatBits.cpp \
+ third_party/skia/src/core/SkFontHost.cpp \
+ third_party/skia/src/core/SkFontDescriptor.cpp \
+ third_party/skia/src/core/SkFontStream.cpp \
+ third_party/skia/src/core/SkGeometry.cpp \
+ third_party/skia/src/core/SkGlyphCache.cpp \
+ third_party/skia/src/core/SkGraphics.cpp \
+ third_party/skia/src/core/SkInstCnt.cpp \
+ third_party/skia/src/core/SkImageFilter.cpp \
+ third_party/skia/src/core/SkImageFilterUtils.cpp \
+ third_party/skia/src/core/SkImageInfo.cpp \
+ third_party/skia/src/core/SkLineClipper.cpp \
+ third_party/skia/src/core/SkMallocPixelRef.cpp \
+ third_party/skia/src/core/SkMask.cpp \
+ third_party/skia/src/core/SkMaskFilter.cpp \
+ third_party/skia/src/core/SkMaskGamma.cpp \
+ third_party/skia/src/core/SkMath.cpp \
+ third_party/skia/src/core/SkMatrix.cpp \
+ third_party/skia/src/core/SkMetaData.cpp \
+ third_party/skia/src/core/SkMipMap.cpp \
+ third_party/skia/src/core/SkOrderedReadBuffer.cpp \
+ third_party/skia/src/core/SkOrderedWriteBuffer.cpp \
+ third_party/skia/src/core/SkPackBits.cpp \
+ third_party/skia/src/core/SkPaint.cpp \
+ third_party/skia/src/core/SkPaintPriv.cpp \
+ third_party/skia/src/core/SkPath.cpp \
+ third_party/skia/src/core/SkPathEffect.cpp \
+ third_party/skia/src/core/SkPathHeap.cpp \
+ third_party/skia/src/core/SkPathMeasure.cpp \
+ third_party/skia/src/core/SkPathRef.cpp \
+ third_party/skia/src/core/SkPicture.cpp \
+ third_party/skia/src/core/SkPictureFlat.cpp \
+ third_party/skia/src/core/SkPicturePlayback.cpp \
+ third_party/skia/src/core/SkPictureRecord.cpp \
+ third_party/skia/src/core/SkPictureStateTree.cpp \
+ third_party/skia/src/core/SkPixelRef.cpp \
+ third_party/skia/src/core/SkPoint.cpp \
+ third_party/skia/src/core/SkProcSpriteBlitter.cpp \
+ third_party/skia/src/core/SkPtrRecorder.cpp \
+ third_party/skia/src/core/SkQuadClipper.cpp \
+ third_party/skia/src/core/SkRasterClip.cpp \
+ third_party/skia/src/core/SkRasterizer.cpp \
+ third_party/skia/src/core/SkRect.cpp \
+ third_party/skia/src/core/SkRefDict.cpp \
+ third_party/skia/src/core/SkRegion.cpp \
+ third_party/skia/src/core/SkRegion_path.cpp \
+ third_party/skia/src/core/SkRRect.cpp \
+ third_party/skia/src/core/SkRTree.cpp \
+ third_party/skia/src/core/SkScaledImageCache.cpp \
+ third_party/skia/src/core/SkScalar.cpp \
+ third_party/skia/src/core/SkScalerContext.cpp \
+ third_party/skia/src/core/SkScan.cpp \
+ third_party/skia/src/core/SkScan_AntiPath.cpp \
+ third_party/skia/src/core/SkScan_Antihair.cpp \
+ third_party/skia/src/core/SkScan_Hairline.cpp \
+ third_party/skia/src/core/SkScan_Path.cpp \
+ third_party/skia/src/core/SkShader.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \
+ third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \
+ third_party/skia/src/core/SkStream.cpp \
+ third_party/skia/src/core/SkString.cpp \
+ third_party/skia/src/core/SkStringUtils.cpp \
+ third_party/skia/src/core/SkStroke.cpp \
+ third_party/skia/src/core/SkStrokeRec.cpp \
+ third_party/skia/src/core/SkStrokerPriv.cpp \
+ third_party/skia/src/core/SkTileGrid.cpp \
+ third_party/skia/src/core/SkTileGridPicture.cpp \
+ third_party/skia/src/core/SkTLS.cpp \
+ third_party/skia/src/core/SkTSearch.cpp \
+ third_party/skia/src/core/SkTypeface.cpp \
+ third_party/skia/src/core/SkTypefaceCache.cpp \
+ third_party/skia/src/core/SkUnPreMultiply.cpp \
+ third_party/skia/src/core/SkUtils.cpp \
+ third_party/skia/src/core/SkValidatingReadBuffer.cpp \
+ third_party/skia/src/core/SkWriter32.cpp \
+ third_party/skia/src/core/SkXfermode.cpp \
+ third_party/skia/src/doc/SkDocument.cpp \
+ third_party/skia/src/image/SkDataPixelRef.cpp \
+ third_party/skia/src/image/SkImage.cpp \
+ third_party/skia/src/image/SkImagePriv.cpp \
+ third_party/skia/src/image/SkImage_Codec.cpp \
+ third_party/skia/src/image/SkImage_Picture.cpp \
+ third_party/skia/src/image/SkImage_Raster.cpp \
+ third_party/skia/src/image/SkSurface.cpp \
+ third_party/skia/src/image/SkSurface_Picture.cpp \
+ third_party/skia/src/image/SkSurface_Raster.cpp \
+ third_party/skia/src/pipe/SkGPipeRead.cpp \
+ third_party/skia/src/pipe/SkGPipeWrite.cpp \
+ third_party/skia/src/lazy/SkCachingPixelRef.cpp \
+ third_party/skia/src/pathops/SkAddIntersections.cpp \
+ third_party/skia/src/pathops/SkDCubicIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDCubicToQuads.cpp \
+ third_party/skia/src/pathops/SkDLineIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadImplicit.cpp \
+ third_party/skia/src/pathops/SkDQuadIntersection.cpp \
+ third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \
+ third_party/skia/src/pathops/SkIntersections.cpp \
+ third_party/skia/src/pathops/SkOpAngle.cpp \
+ third_party/skia/src/pathops/SkOpContour.cpp \
+ third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \
+ third_party/skia/src/pathops/SkOpSegment.cpp \
+ third_party/skia/src/pathops/SkPathOpsBounds.cpp \
+ third_party/skia/src/pathops/SkPathOpsCommon.cpp \
+ third_party/skia/src/pathops/SkPathOpsCubic.cpp \
+ third_party/skia/src/pathops/SkPathOpsDebug.cpp \
+ third_party/skia/src/pathops/SkPathOpsLine.cpp \
+ third_party/skia/src/pathops/SkPathOpsOp.cpp \
+ third_party/skia/src/pathops/SkPathOpsPoint.cpp \
+ third_party/skia/src/pathops/SkPathOpsQuad.cpp \
+ third_party/skia/src/pathops/SkPathOpsRect.cpp \
+ third_party/skia/src/pathops/SkPathOpsSimplify.cpp \
+ third_party/skia/src/pathops/SkPathOpsTriangle.cpp \
+ third_party/skia/src/pathops/SkPathOpsTypes.cpp \
+ third_party/skia/src/pathops/SkPathWriter.cpp \
+ third_party/skia/src/pathops/SkQuarticRoot.cpp \
+ third_party/skia/src/pathops/SkReduceOrder.cpp \
+ third_party/skia/src/effects/Sk1DPathEffect.cpp \
+ third_party/skia/src/effects/Sk2DPathEffect.cpp \
+ third_party/skia/src/effects/SkArithmeticMode.cpp \
+ third_party/skia/src/effects/SkAvoidXfermode.cpp \
+ third_party/skia/src/effects/SkBicubicImageFilter.cpp \
+ third_party/skia/src/effects/SkBitmapAlphaThresholdShader.cpp \
+ third_party/skia/src/effects/SkBitmapSource.cpp \
+ third_party/skia/src/effects/SkBlurDrawLooper.cpp \
+ third_party/skia/src/effects/SkBlurMask.cpp \
+ third_party/skia/src/effects/SkBlurImageFilter.cpp \
+ third_party/skia/src/effects/SkBlurMaskFilter.cpp \
+ third_party/skia/src/effects/SkColorFilters.cpp \
+ third_party/skia/src/effects/SkColorFilterImageFilter.cpp \
+ third_party/skia/src/effects/SkColorMatrix.cpp \
+ third_party/skia/src/effects/SkColorMatrixFilter.cpp \
+ third_party/skia/src/effects/SkComposeImageFilter.cpp \
+ third_party/skia/src/effects/SkCornerPathEffect.cpp \
+ third_party/skia/src/effects/SkDashPathEffect.cpp \
+ third_party/skia/src/effects/SkDiscretePathEffect.cpp \
+ third_party/skia/src/effects/SkDisplacementMapEffect.cpp \
+ third_party/skia/src/effects/SkDropShadowImageFilter.cpp \
+ third_party/skia/src/effects/SkEmbossMask.cpp \
+ third_party/skia/src/effects/SkEmbossMaskFilter.cpp \
+ third_party/skia/src/effects/SkGpuBlurUtils.cpp \
+ third_party/skia/src/effects/SkKernel33MaskFilter.cpp \
+ third_party/skia/src/effects/SkLayerDrawLooper.cpp \
+ third_party/skia/src/effects/SkLayerRasterizer.cpp \
+ third_party/skia/src/effects/SkLerpXfermode.cpp \
+ third_party/skia/src/effects/SkLightingImageFilter.cpp \
+ third_party/skia/src/effects/SkLumaColorFilter.cpp \
+ third_party/skia/src/effects/SkMagnifierImageFilter.cpp \
+ third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \
+ third_party/skia/src/effects/SkMergeImageFilter.cpp \
+ third_party/skia/src/effects/SkMorphologyImageFilter.cpp \
+ third_party/skia/src/effects/SkOffsetImageFilter.cpp \
+ third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \
+ third_party/skia/src/effects/SkPerlinNoiseShader.cpp \
+ third_party/skia/src/effects/SkPictureImageFilter.cpp \
+ third_party/skia/src/effects/SkPixelXorXfermode.cpp \
+ third_party/skia/src/effects/SkPorterDuff.cpp \
+ third_party/skia/src/effects/SkRectShaderImageFilter.cpp \
+ third_party/skia/src/effects/SkStippleMaskFilter.cpp \
+ third_party/skia/src/effects/SkTableColorFilter.cpp \
+ third_party/skia/src/effects/SkTableMaskFilter.cpp \
+ third_party/skia/src/effects/SkTestImageFilters.cpp \
+ third_party/skia/src/effects/SkTileImageFilter.cpp \
+ third_party/skia/src/effects/SkTransparentShader.cpp \
+ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \
+ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \
+ third_party/skia/src/effects/gradients/SkClampRange.cpp \
+ third_party/skia/src/effects/gradients/SkGradientShader.cpp \
+ third_party/skia/src/effects/gradients/SkLinearGradient.cpp \
+ third_party/skia/src/effects/gradients/SkRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \
+ third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \
+ third_party/skia/src/effects/gradients/SkSweepGradient.cpp \
+ third_party/skia/src/pdf/SkPDFCatalog.cpp \
+ third_party/skia/src/pdf/SkPDFDevice.cpp \
+ third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \
+ third_party/skia/src/pdf/SkPDFDocument.cpp \
+ third_party/skia/src/pdf/SkPDFFont.cpp \
+ third_party/skia/src/pdf/SkPDFFormXObject.cpp \
+ third_party/skia/src/pdf/SkPDFGraphicState.cpp \
+ third_party/skia/src/pdf/SkPDFImage.cpp \
+ third_party/skia/src/pdf/SkPDFPage.cpp \
+ third_party/skia/src/pdf/SkPDFResourceDict.cpp \
+ third_party/skia/src/pdf/SkPDFShader.cpp \
+ third_party/skia/src/pdf/SkPDFStream.cpp \
+ third_party/skia/src/pdf/SkPDFTypes.cpp \
+ third_party/skia/src/pdf/SkPDFUtils.cpp \
+ third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \
+ third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \
+ third_party/skia/src/gpu/GrAARectRenderer.cpp \
+ third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \
+ third_party/skia/src/gpu/GrAllocPool.cpp \
+ third_party/skia/src/gpu/GrAtlas.cpp \
+ third_party/skia/src/gpu/GrBitmapTextContext.cpp \
+ third_party/skia/src/gpu/GrBlend.cpp \
+ third_party/skia/src/gpu/GrBufferAllocPool.cpp \
+ third_party/skia/src/gpu/GrCacheID.cpp \
+ third_party/skia/src/gpu/GrClipData.cpp \
+ third_party/skia/src/gpu/GrContext.cpp \
+ third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \
+ third_party/skia/src/gpu/GrDrawState.cpp \
+ third_party/skia/src/gpu/GrDrawTarget.cpp \
+ third_party/skia/src/gpu/GrEffect.cpp \
+ third_party/skia/src/gpu/GrClipMaskCache.cpp \
+ third_party/skia/src/gpu/GrClipMaskManager.cpp \
+ third_party/skia/src/gpu/GrGpu.cpp \
+ third_party/skia/src/gpu/GrGpuFactory.cpp \
+ third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \
+ third_party/skia/src/gpu/GrMemoryPool.cpp \
+ third_party/skia/src/gpu/GrOvalRenderer.cpp \
+ third_party/skia/src/gpu/GrPaint.cpp \
+ third_party/skia/src/gpu/GrPath.cpp \
+ third_party/skia/src/gpu/GrPathRendererChain.cpp \
+ third_party/skia/src/gpu/GrPathRenderer.cpp \
+ third_party/skia/src/gpu/GrPathUtils.cpp \
+ third_party/skia/src/gpu/GrRectanizer.cpp \
+ third_party/skia/src/gpu/GrRectanizer_skyline.cpp \
+ third_party/skia/src/gpu/GrRenderTarget.cpp \
+ third_party/skia/src/gpu/GrReducedClip.cpp \
+ third_party/skia/src/gpu/GrResource.cpp \
+ third_party/skia/src/gpu/GrResourceCache.cpp \
+ third_party/skia/src/gpu/GrStencil.cpp \
+ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \
+ third_party/skia/src/gpu/GrStencilBuffer.cpp \
+ third_party/skia/src/gpu/GrSWMaskHelper.cpp \
+ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \
+ third_party/skia/src/gpu/GrSurface.cpp \
+ third_party/skia/src/gpu/GrTextContext.cpp \
+ third_party/skia/src/gpu/GrTextStrike.cpp \
+ third_party/skia/src/gpu/GrTexture.cpp \
+ third_party/skia/src/gpu/GrTextureAccess.cpp \
+ third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBezierEffect.cpp \
+ third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \
+ third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \
+ third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrTextureDomain.cpp \
+ third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \
+ third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \
+ third_party/skia/src/gpu/gl/GrGLCaps.cpp \
+ third_party/skia/src/gpu/gl/GrGLContext.cpp \
+ third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \
+ third_party/skia/src/gpu/gl/GrGLExtensions.cpp \
+ third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \
+ third_party/skia/src/gpu/gl/GrGLPath.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgram.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \
+ third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \
+ third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \
+ third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \
+ third_party/skia/src/gpu/gl/GrGLSL.cpp \
+ third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGLTexture.cpp \
+ third_party/skia/src/gpu/gl/GrGLUtil.cpp \
+ third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \
+ third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL.cpp \
+ third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \
+ third_party/skia/src/gpu/SkGpuDevice.cpp \
+ third_party/skia/src/gpu/SkGr.cpp \
+ third_party/skia/src/gpu/SkGrFontScaler.cpp \
+ third_party/skia/src/gpu/SkGrPixelRef.cpp \
+ third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \
+ third_party/skia/src/image/SkImage_Gpu.cpp \
+ third_party/skia/src/image/SkSurface_Gpu.cpp \
+ third_party/skia/src/gpu/gl/SkGLContextHelper.cpp
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Debug := \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -m32 \
+ -mmmx \
+ -march=pentium4 \
+ -msse2 \
+ -mfpmath=sse \
+ -fuse-ld=gold \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -fno-stack-protector \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -g \
+ -fomit-frame-pointer \
+ -fdata-sections \
+ -ffunction-sections
+
+MY_DEFS_Debug := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
+ '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
+ '-D_DEBUG'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Debug := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -m32 \
+ -mmmx \
+ -march=pentium4 \
+ -msse2 \
+ -mfpmath=sse \
+ -fuse-ld=gold \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -fno-stack-protector \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -Os \
+ -fno-ident \
+ -fdata-sections \
+ -ffunction-sections \
+ -fomit-frame-pointer \
+ -fno-unwind-tables \
+ -fno-asynchronous-unwind-tables
+
+MY_DEFS_Release := \
+ '-DV8_DEPRECATION_WARNINGS' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_CONFIGURATION_POLICY' \
+ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
+ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
+ '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DCLD_VERSION=1' \
+ '-DENABLE_PRINTING=1' \
+ '-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
+ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
+ '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \
+ '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \
+ '-DIGNORE_ROT_AA_RECT_OPT' \
+ '-DSK_IGNORE_BLURRED_RRECT_OPT' \
+ '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \
+ '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \
+ '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \
+ '-DSK_GAMMA_APPLY_TO_A8' \
+ '-DSK_GAMMA_EXPONENT=1.4' \
+ '-DSK_GAMMA_CONTRAST=0.0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
+ '-DANDROID' \
+ '-D__GNU_SOURCE=1' \
+ '-DUSE_STLPORT=1' \
+ '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \
+ '-DCHROME_BUILD_ID=""' \
+ '-DNDEBUG' \
+ '-DNVALGRIND' \
+ '-DDYNAMIC_ANNOTATIONS_ENABLED=0'
+
+
+# Include paths placed before CFLAGS/CPPFLAGS
+LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/images \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/image \
+ $(LOCAL_PATH)/third_party/skia/src/ports \
+ $(LOCAL_PATH)/third_party/skia/src/sfnt \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
+ $(LOCAL_PATH)/third_party/skia/src/lazy \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/src/gpu \
+ $(LOCAL_PATH)/third_party/expat/files/lib \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(PWD)/external/expat/lib \
+ $(LOCAL_PATH)/third_party/freetype/include \
+ $(PWD)/frameworks/wilhelm/include \
+ $(PWD)/bionic \
+ $(PWD)/external/stlport/stlport
+
+
+# Flags passed to only C++ (and not C) files.
+LOCAL_CPPFLAGS_Release := \
+ -fno-rtti \
+ -fno-threadsafe-statics \
+ -fvisibility-inlines-hidden \
+ -Wno-deprecated \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
### Rules for final target.
+
+LOCAL_LDFLAGS_Debug := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -m32 \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,--fatal-warnings \
+ -Wl,--gc-sections \
+ -Wl,--warn-shared-textrel \
+ -Wl,-O1 \
+ -Wl,--as-needed
+
+
+LOCAL_LDFLAGS_Release := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -m32 \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,-O1 \
+ -Wl,--as-needed \
+ -Wl,--gc-sections \
+ -Wl,--fatal-warnings \
+ -Wl,--warn-shared-textrel
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
+LOCAL_STATIC_LIBRARIES :=
+
+# Enable grouping to fix circular references
+LOCAL_GROUP_STATIC_LIBRARIES := true
+
+LOCAL_SHARED_LIBRARIES := \
+ libstlport \
+ libdl
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: skia_skia_library_gyp
@@ -635,12 +713,4 @@
.PHONY: skia_library
skia_library: skia_skia_library_gyp
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
- $(hide) echo "Gyp timestamp: $@"
- $(hide) mkdir -p $(dir $@)
- $(hide) touch $@
+include $(BUILD_STATIC_LIBRARY)
diff --git a/skia/skia_system.gypi b/skia/skia_system.gypi
index a11fd10..4288597 100644
--- a/skia/skia_system.gypi
+++ b/skia/skia_system.gypi
@@ -14,8 +14,6 @@
# version of skia is already required to be the same as the chromium version
# so using the bundled headers shouldn't break anything.
'include_dirs': [
- '<(android_src)/external/skia/include',
- '<(android_src)/external/skia/include/core',
'../third_party/skia/src/core',
],
'defines': [
diff --git a/ui/events/events.target.darwin-arm.mk b/ui/events/events.target.darwin-arm.mk
index fc7d866..c2eff7b 100644
--- a/ui/events/events.target.darwin-arm.mk
+++ b/ui/events/events.target.darwin-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -93,7 +94,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -109,15 +120,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -189,7 +206,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -206,15 +233,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,13 +313,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/events/events.target.darwin-mips.mk b/ui/events/events.target.darwin-mips.mk
index fbd280c..5cfdb09 100644
--- a/ui/events/events.target.darwin-mips.mk
+++ b/ui/events/events.target.darwin-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -92,7 +93,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -108,15 +119,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -187,7 +204,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -204,15 +231,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -274,13 +307,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/events/events.target.darwin-x86.mk b/ui/events/events.target.darwin-x86.mk
index cbf60d0..86f4677 100644
--- a/ui/events/events.target.darwin-x86.mk
+++ b/ui/events/events.target.darwin-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -95,7 +96,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -111,15 +122,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -194,7 +211,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -211,15 +238,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,13 +313,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/events/events.target.linux-arm.mk b/ui/events/events.target.linux-arm.mk
index fc7d866..c2eff7b 100644
--- a/ui/events/events.target.linux-arm.mk
+++ b/ui/events/events.target.linux-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -93,7 +94,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -109,15 +120,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -189,7 +206,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -206,15 +233,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,13 +313,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/events/events.target.linux-mips.mk b/ui/events/events.target.linux-mips.mk
index fbd280c..5cfdb09 100644
--- a/ui/events/events.target.linux-mips.mk
+++ b/ui/events/events.target.linux-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -92,7 +93,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -108,15 +119,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -187,7 +204,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -204,15 +231,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -274,13 +307,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/events/events.target.linux-x86.mk b/ui/events/events.target.linux-x86.mk
index cbf60d0..86f4677 100644
--- a/ui/events/events.target.linux-x86.mk
+++ b/ui/events/events.target.linux-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -95,7 +96,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -111,15 +122,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -194,7 +211,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DEVENTS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -211,15 +238,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,13 +313,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gfx/gfx.target.darwin-arm.mk b/ui/gfx/gfx.target.darwin-arm.mk
index c31b18f..016f660 100644
--- a/ui/gfx/gfx.target.darwin-arm.mk
+++ b/ui/gfx/gfx.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
@@ -154,7 +155,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -174,15 +185,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -259,7 +276,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -280,15 +307,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -358,13 +391,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gfx/gfx.target.darwin-mips.mk b/ui/gfx/gfx.target.darwin-mips.mk
index 25ca30c..236d9a6 100644
--- a/ui/gfx/gfx.target.darwin-mips.mk
+++ b/ui/gfx/gfx.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
@@ -153,7 +154,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -173,15 +184,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -257,7 +274,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -278,15 +305,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -352,13 +385,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gfx/gfx.target.darwin-x86.mk b/ui/gfx/gfx.target.darwin-x86.mk
index 139ba76..78bf947 100644
--- a/ui/gfx/gfx.target.darwin-x86.mk
+++ b/ui/gfx/gfx.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
@@ -155,7 +156,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -175,15 +186,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -262,7 +279,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -283,15 +310,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -356,13 +389,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gfx/gfx.target.linux-arm.mk b/ui/gfx/gfx.target.linux-arm.mk
index c31b18f..016f660 100644
--- a/ui/gfx/gfx.target.linux-arm.mk
+++ b/ui/gfx/gfx.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
@@ -154,7 +155,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -174,15 +185,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -259,7 +276,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -280,15 +307,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -358,13 +391,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gfx/gfx.target.linux-mips.mk b/ui/gfx/gfx.target.linux-mips.mk
index 25ca30c..236d9a6 100644
--- a/ui/gfx/gfx.target.linux-mips.mk
+++ b/ui/gfx/gfx.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
@@ -153,7 +154,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -173,15 +184,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -257,7 +274,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -278,15 +305,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -352,13 +385,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gfx/gfx.target.linux-x86.mk b/ui/gfx/gfx.target.linux-x86.mk
index 139ba76..78bf947 100644
--- a/ui/gfx/gfx.target.linux-x86.mk
+++ b/ui/gfx/gfx.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp)/libjpeg.stamp \
@@ -155,7 +156,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -175,15 +186,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -262,7 +279,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DGFX_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -283,15 +310,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -356,13 +389,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gl/gl.target.darwin-arm.mk b/ui/gl/gl.target.darwin-arm.mk
index b46afa4..bfe4738 100644
--- a/ui/gl/gl.target.darwin-arm.mk
+++ b/ui/gl/gl.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_mesa_mesa_headers_gyp)/mesa_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gl_gl_jni_headers_gyp)/gl_jni_headers.stamp
@@ -190,7 +191,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -207,9 +218,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -218,9 +228,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -295,7 +312,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -313,9 +340,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -324,9 +350,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -392,13 +425,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gl/gl.target.darwin-mips.mk b/ui/gl/gl.target.darwin-mips.mk
index f07b78a..98b3880 100644
--- a/ui/gl/gl.target.darwin-mips.mk
+++ b/ui/gl/gl.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_mesa_mesa_headers_gyp)/mesa_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gl_gl_jni_headers_gyp)/gl_jni_headers.stamp
@@ -189,7 +190,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -206,9 +217,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -217,9 +227,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -293,7 +310,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -311,9 +338,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -322,9 +348,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -386,13 +419,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gl/gl.target.darwin-x86.mk b/ui/gl/gl.target.darwin-x86.mk
index 63be7e0..c54a6dd 100644
--- a/ui/gl/gl.target.darwin-x86.mk
+++ b/ui/gl/gl.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_mesa_mesa_headers_gyp)/mesa_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gl_gl_jni_headers_gyp)/gl_jni_headers.stamp
@@ -192,7 +193,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -209,9 +220,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -220,9 +230,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -300,7 +317,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -318,9 +345,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -329,9 +355,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -392,13 +425,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gl/gl.target.linux-arm.mk b/ui/gl/gl.target.linux-arm.mk
index b46afa4..bfe4738 100644
--- a/ui/gl/gl.target.linux-arm.mk
+++ b/ui/gl/gl.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_mesa_mesa_headers_gyp)/mesa_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gl_gl_jni_headers_gyp)/gl_jni_headers.stamp
@@ -190,7 +191,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -207,9 +218,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -218,9 +228,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -295,7 +312,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -313,9 +340,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -324,9 +350,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -392,13 +425,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gl/gl.target.linux-mips.mk b/ui/gl/gl.target.linux-mips.mk
index f07b78a..98b3880 100644
--- a/ui/gl/gl.target.linux-mips.mk
+++ b/ui/gl/gl.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_mesa_mesa_headers_gyp)/mesa_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gl_gl_jni_headers_gyp)/gl_jni_headers.stamp
@@ -189,7 +190,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -206,9 +217,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -217,9 +227,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -293,7 +310,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -311,9 +338,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -322,9 +348,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -386,13 +419,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/gl/gl.target.linux-x86.mk b/ui/gl/gl.target.linux-x86.mk
index 63be7e0..c54a6dd 100644
--- a/ui/gl/gl.target.linux-x86.mk
+++ b/ui/gl/gl.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_mesa_mesa_headers_gyp)/mesa_headers.stamp \
$(call intermediates-dir-for,GYP,ui_gl_gl_jni_headers_gyp)/gl_jni_headers.stamp
@@ -192,7 +193,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -209,9 +220,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -220,9 +230,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -300,7 +317,17 @@
'-DGL_IMPLEMENTATION' \
'-DGL_GLEXT_PROTOTYPES' \
'-DEGL_EGLEXT_PROTOTYPES' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -318,9 +345,8 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH)/third_party/swiftshader/include \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -329,9 +355,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -392,13 +425,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/native_theme/native_theme.target.darwin-arm.mk b/ui/native_theme/native_theme.target.darwin-arm.mk
index 6150ae7..e2d1bb6 100644
--- a/ui/native_theme/native_theme.target.darwin-arm.mk
+++ b/ui/native_theme/native_theme.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -84,7 +85,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -101,15 +112,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -182,7 +199,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -200,15 +227,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -276,13 +309,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/native_theme/native_theme.target.darwin-mips.mk b/ui/native_theme/native_theme.target.darwin-mips.mk
index b4fd5f9..51de8ed 100644
--- a/ui/native_theme/native_theme.target.darwin-mips.mk
+++ b/ui/native_theme/native_theme.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -83,7 +84,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -100,15 +111,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -180,7 +197,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -198,15 +225,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -270,13 +303,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/native_theme/native_theme.target.darwin-x86.mk b/ui/native_theme/native_theme.target.darwin-x86.mk
index 238c914..87c84c9 100644
--- a/ui/native_theme/native_theme.target.darwin-x86.mk
+++ b/ui/native_theme/native_theme.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -86,7 +87,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -102,15 +113,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -186,7 +203,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -203,15 +230,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -274,13 +307,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/native_theme/native_theme.target.linux-arm.mk b/ui/native_theme/native_theme.target.linux-arm.mk
index 6150ae7..e2d1bb6 100644
--- a/ui/native_theme/native_theme.target.linux-arm.mk
+++ b/ui/native_theme/native_theme.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -84,7 +85,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -101,15 +112,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -182,7 +199,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -200,15 +227,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -276,13 +309,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/native_theme/native_theme.target.linux-mips.mk b/ui/native_theme/native_theme.target.linux-mips.mk
index b4fd5f9..51de8ed 100644
--- a/ui/native_theme/native_theme.target.linux-mips.mk
+++ b/ui/native_theme/native_theme.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -83,7 +84,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -100,15 +111,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -180,7 +197,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -198,15 +225,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -270,13 +303,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/native_theme/native_theme.target.linux-x86.mk b/ui/native_theme/native_theme.target.linux-x86.mk
index 238c914..87c84c9 100644
--- a/ui/native_theme/native_theme.target.linux-x86.mk
+++ b/ui/native_theme/native_theme.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -86,7 +87,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -102,15 +113,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -186,7 +203,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DNATIVE_THEME_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -203,15 +230,21 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -274,13 +307,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk
index 2c7399f..87813d1 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,ui_ui_base_jni_headers_gyp)/ui_base_jni_headers.stamp
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -105,16 +116,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -188,7 +205,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -206,16 +233,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk
index def6c68..16e7aa8 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,ui_ui_base_jni_headers_gyp)/ui_base_jni_headers.stamp
@@ -87,7 +88,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -104,16 +115,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -186,7 +203,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -204,16 +231,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -278,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk b/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk
index 2a595c2..030c7ee 100644
--- a/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,ui_ui_base_jni_headers_gyp)/ui_base_jni_headers.stamp
@@ -90,7 +91,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -106,16 +117,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -192,7 +209,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -209,16 +236,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -282,13 +315,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk b/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk
index 2c7399f..87813d1 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,ui_ui_base_jni_headers_gyp)/ui_base_jni_headers.stamp
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -105,16 +116,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -188,7 +205,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -206,16 +233,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk b/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk
index def6c68..16e7aa8 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,ui_ui_base_jni_headers_gyp)/ui_base_jni_headers.stamp
@@ -87,7 +88,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -104,16 +115,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -186,7 +203,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DPOSIX_AVOID_MMAP' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
@@ -204,16 +231,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -278,13 +311,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk b/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk
index 2a595c2..030c7ee 100644
--- a/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk
+++ b/ui/shell_dialogs/shell_dialogs.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,ui_ui_base_jni_headers_gyp)/ui_base_jni_headers.stamp
@@ -90,7 +91,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -106,16 +117,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -192,7 +209,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSHELL_DIALOGS_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -209,16 +236,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/app_locale_settings \
$(gyp_shared_intermediate_dir)/ui/ui_strings \
@@ -282,13 +315,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/snapshot/snapshot.target.darwin-arm.mk b/ui/snapshot/snapshot.target.darwin-arm.mk
index 4bc0223..4b468ee 100644
--- a/ui/snapshot/snapshot.target.darwin-arm.mk
+++ b/ui/snapshot/snapshot.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -96,16 +107,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -177,7 +194,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -195,16 +222,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -271,13 +304,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/snapshot/snapshot.target.darwin-mips.mk b/ui/snapshot/snapshot.target.darwin-mips.mk
index cc64045..fd1749f 100644
--- a/ui/snapshot/snapshot.target.darwin-mips.mk
+++ b/ui/snapshot/snapshot.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -78,7 +79,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -95,16 +106,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -175,7 +192,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -193,16 +220,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -265,13 +298,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/snapshot/snapshot.target.darwin-x86.mk b/ui/snapshot/snapshot.target.darwin-x86.mk
index a3a68e3..b1cb29c 100644
--- a/ui/snapshot/snapshot.target.darwin-x86.mk
+++ b/ui/snapshot/snapshot.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -81,7 +82,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -97,16 +108,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -181,7 +198,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -198,16 +225,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/snapshot/snapshot.target.linux-arm.mk b/ui/snapshot/snapshot.target.linux-arm.mk
index 4bc0223..4b468ee 100644
--- a/ui/snapshot/snapshot.target.linux-arm.mk
+++ b/ui/snapshot/snapshot.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -96,16 +107,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -177,7 +194,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -195,16 +222,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -271,13 +304,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/snapshot/snapshot.target.linux-mips.mk b/ui/snapshot/snapshot.target.linux-mips.mk
index cc64045..fd1749f 100644
--- a/ui/snapshot/snapshot.target.linux-mips.mk
+++ b/ui/snapshot/snapshot.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -78,7 +79,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -95,16 +106,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -175,7 +192,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DPOSIX_AVOID_MMAP' \
'-D__STDC_CONSTANT_MACROS' \
@@ -193,16 +220,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -265,13 +298,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/snapshot/snapshot.target.linux-x86.mk b/ui/snapshot/snapshot.target.linux-x86.mk
index a3a68e3..b1cb29c 100644
--- a/ui/snapshot/snapshot.target.linux-x86.mk
+++ b/ui/snapshot/snapshot.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -81,7 +82,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -97,16 +108,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -181,7 +198,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DSNAPSHOT_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -198,16 +225,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -269,13 +302,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/surface/surface.target.darwin-arm.mk b/ui/surface/surface.target.darwin-arm.mk
index daa2aff..7e96061 100644
--- a/ui/surface/surface.target.darwin-arm.mk
+++ b/ui/surface/surface.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -84,7 +85,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -102,7 +113,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -110,9 +120,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -207,7 +234,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -215,9 +241,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -286,6 +319,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -293,7 +327,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/surface/surface.target.darwin-mips.mk b/ui/surface/surface.target.darwin-mips.mk
index 96c905e..e139528 100644
--- a/ui/surface/surface.target.darwin-mips.mk
+++ b/ui/surface/surface.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -83,7 +84,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,9 +119,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -186,7 +203,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -205,7 +232,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -213,9 +239,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,6 +313,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -287,7 +321,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/surface/surface.target.darwin-x86.mk b/ui/surface/surface.target.darwin-x86.mk
index 8ffc142..5a7b226 100644
--- a/ui/surface/surface.target.darwin-x86.mk
+++ b/ui/surface/surface.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -86,7 +87,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -111,9 +121,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -192,7 +209,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -210,7 +237,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -218,9 +244,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,6 +317,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -291,7 +325,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/surface/surface.target.linux-arm.mk b/ui/surface/surface.target.linux-arm.mk
index daa2aff..7e96061 100644
--- a/ui/surface/surface.target.linux-arm.mk
+++ b/ui/surface/surface.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -84,7 +85,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -102,7 +113,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -110,9 +120,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -207,7 +234,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -215,9 +241,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -286,6 +319,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -293,7 +327,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/surface/surface.target.linux-mips.mk b/ui/surface/surface.target.linux-mips.mk
index 96c905e..e139528 100644
--- a/ui/surface/surface.target.linux-mips.mk
+++ b/ui/surface/surface.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -83,7 +84,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -101,7 +112,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -109,9 +119,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -186,7 +203,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DPOSIX_AVOID_MMAP' \
@@ -205,7 +232,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -213,9 +239,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,6 +313,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -287,7 +321,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/surface/surface.target.linux-x86.mk b/ui/surface/surface.target.linux-x86.mk
index 8ffc142..5a7b226 100644
--- a/ui/surface/surface.target.linux-x86.mk
+++ b/ui/surface/surface.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a
@@ -86,7 +87,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -111,9 +121,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -192,7 +209,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DSURFACE_IMPLEMENTATION' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-D__STDC_CONSTANT_MACROS' \
@@ -210,7 +237,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -218,9 +244,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,6 +317,7 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp \
ui_ui_gyp
@@ -291,7 +325,6 @@
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/ui.target.darwin-arm.mk b/ui/ui.target.darwin-arm.mk
index 377ec36..0fd5b45 100644
--- a/ui/ui.target.darwin-arm.mk
+++ b/ui/ui.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
@@ -126,7 +127,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -145,16 +156,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -232,7 +249,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -252,16 +279,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -332,13 +365,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/ui.target.darwin-mips.mk b/ui/ui.target.darwin-mips.mk
index f03617f..d7f778d 100644
--- a/ui/ui.target.darwin-mips.mk
+++ b/ui/ui.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
@@ -125,7 +126,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -144,16 +155,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -230,7 +247,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -250,16 +277,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -326,13 +359,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/ui.target.darwin-x86.mk b/ui/ui.target.darwin-x86.mk
index 3261972..80b712e 100644
--- a/ui/ui.target.darwin-x86.mk
+++ b/ui/ui.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
@@ -127,7 +128,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -146,16 +157,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -235,7 +252,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -255,16 +282,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -330,13 +363,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/ui.target.linux-arm.mk b/ui/ui.target.linux-arm.mk
index 377ec36..0fd5b45 100644
--- a/ui/ui.target.linux-arm.mk
+++ b/ui/ui.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
@@ -126,7 +127,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -145,16 +156,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -232,7 +249,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -252,16 +279,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -332,13 +365,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/ui.target.linux-mips.mk b/ui/ui.target.linux-mips.mk
index f03617f..d7f778d 100644
--- a/ui/ui.target.linux-mips.mk
+++ b/ui/ui.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
@@ -125,7 +126,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -144,16 +155,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -230,7 +247,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -250,16 +277,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -326,13 +359,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/ui/ui.target.linux-x86.mk b/ui/ui.target.linux-x86.mk
index 3261972..80b712e 100644
--- a/ui/ui.target.linux-x86.mk
+++ b/ui/ui.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,ui_base_strings_ui_strings_gyp)/ui_strings.stamp \
@@ -127,7 +128,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -146,16 +157,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -235,7 +252,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DUI_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -255,16 +282,22 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(gyp_shared_intermediate_dir)/ui \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -330,13 +363,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/child/webkit_child.target.darwin-arm.mk b/webkit/child/webkit_child.target.darwin-arm.mk
index 7df38da..e109e88 100644
--- a/webkit/child/webkit_child.target.darwin-arm.mk
+++ b/webkit/child/webkit_child.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp \
@@ -100,7 +101,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -120,7 +131,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -130,9 +140,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -216,7 +233,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -237,7 +264,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -247,9 +273,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -327,13 +360,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/child/webkit_child.target.darwin-mips.mk b/webkit/child/webkit_child.target.darwin-mips.mk
index cf02255..4931ebf 100644
--- a/webkit/child/webkit_child.target.darwin-mips.mk
+++ b/webkit/child/webkit_child.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp \
@@ -99,7 +100,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -119,7 +130,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -129,9 +139,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -214,7 +231,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -235,7 +262,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -245,9 +271,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -321,13 +354,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/child/webkit_child.target.darwin-x86.mk b/webkit/child/webkit_child.target.darwin-x86.mk
index 409d40c..73bb2a7 100644
--- a/webkit/child/webkit_child.target.darwin-x86.mk
+++ b/webkit/child/webkit_child.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp \
@@ -101,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -121,7 +132,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -131,9 +141,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -219,7 +236,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -240,7 +267,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -250,9 +276,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -325,13 +358,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/child/webkit_child.target.linux-arm.mk b/webkit/child/webkit_child.target.linux-arm.mk
index 7df38da..e109e88 100644
--- a/webkit/child/webkit_child.target.linux-arm.mk
+++ b/webkit/child/webkit_child.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp \
@@ -100,7 +101,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -120,7 +131,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -130,9 +140,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -216,7 +233,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -237,7 +264,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -247,9 +273,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -327,13 +360,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/child/webkit_child.target.linux-mips.mk b/webkit/child/webkit_child.target.linux-mips.mk
index cf02255..4931ebf 100644
--- a/webkit/child/webkit_child.target.linux-mips.mk
+++ b/webkit/child/webkit_child.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp \
@@ -99,7 +100,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -119,7 +130,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -129,9 +139,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -214,7 +231,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -235,7 +262,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -245,9 +271,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -321,13 +354,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/child/webkit_child.target.linux-x86.mk b/webkit/child/webkit_child.target.linux-x86.mk
index 409d40c..73bb2a7 100644
--- a/webkit/child/webkit_child.target.linux-x86.mk
+++ b/webkit/child/webkit_child.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp \
@@ -101,7 +102,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -121,7 +132,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -131,9 +141,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -219,7 +236,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_CHILD_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -240,7 +267,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -250,9 +276,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -325,13 +358,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk b/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk
index c8806f4..29ffe56 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -193,7 +210,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -208,7 +235,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -217,9 +243,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -289,13 +322,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk b/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk
index 89ad2e6..6f7c2a7 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -193,7 +210,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -208,7 +235,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -217,9 +243,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -285,13 +318,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk b/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk
index 3cca63f..1cfbb18 100644
--- a/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk
+++ b/webkit/common/gpu/webkit_gpu.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -90,7 +91,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -105,7 +116,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -114,9 +124,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -198,7 +215,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -213,7 +240,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -222,9 +248,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -289,13 +322,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-arm.mk b/webkit/common/gpu/webkit_gpu.target.linux-arm.mk
index c8806f4..29ffe56 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-arm.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -193,7 +210,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -208,7 +235,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -217,9 +243,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -289,13 +322,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-mips.mk b/webkit/common/gpu/webkit_gpu.target.linux-mips.mk
index 89ad2e6..6f7c2a7 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-mips.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -88,7 +89,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -193,7 +210,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -208,7 +235,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -217,9 +243,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -285,13 +318,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/gpu/webkit_gpu.target.linux-x86.mk b/webkit/common/gpu/webkit_gpu.target.linux-x86.mk
index 3cca63f..1cfbb18 100644
--- a/webkit/common/gpu/webkit_gpu.target.linux-x86.mk
+++ b/webkit/common/gpu/webkit_gpu.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_minimal_gyp)/blink_minimal.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_gl_gl_gyp)/ui_gl_gl_gyp.a
@@ -90,7 +91,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -105,7 +116,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -114,9 +124,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -198,7 +215,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_GPU_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DANDROID' \
@@ -213,7 +240,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -222,9 +248,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(gyp_shared_intermediate_dir)/ui/gl \
$(LOCAL_PATH)/third_party/mesa/src/include \
@@ -289,13 +322,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/webkit_common.target.darwin-arm.mk b/webkit/common/webkit_common.target.darwin-arm.mk
index a33bee3..8f1b3f6 100644
--- a/webkit/common/webkit_common.target.darwin-arm.mk
+++ b/webkit/common/webkit_common.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,webkit_webkit_resources_gyp)/webkit_resources.stamp
@@ -89,7 +90,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -105,7 +116,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -114,9 +124,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -207,7 +234,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -216,9 +242,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -286,13 +319,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/webkit_common.target.darwin-mips.mk b/webkit/common/webkit_common.target.darwin-mips.mk
index c643e32..ea7ed90 100644
--- a/webkit/common/webkit_common.target.darwin-mips.mk
+++ b/webkit/common/webkit_common.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,webkit_webkit_resources_gyp)/webkit_resources.stamp
@@ -88,7 +89,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -104,7 +115,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -113,9 +123,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -205,7 +232,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -214,9 +240,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,13 +313,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/webkit_common.target.darwin-x86.mk b/webkit/common/webkit_common.target.darwin-x86.mk
index 0d544db..3b3e869 100644
--- a/webkit/common/webkit_common.target.darwin-x86.mk
+++ b/webkit/common/webkit_common.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,webkit_webkit_resources_gyp)/webkit_resources.stamp
@@ -90,7 +91,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -106,7 +117,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -115,9 +125,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -193,7 +210,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -210,7 +237,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -219,9 +245,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/webkit_common.target.linux-arm.mk b/webkit/common/webkit_common.target.linux-arm.mk
index a33bee3..8f1b3f6 100644
--- a/webkit/common/webkit_common.target.linux-arm.mk
+++ b/webkit/common/webkit_common.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,webkit_webkit_resources_gyp)/webkit_resources.stamp
@@ -89,7 +90,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -105,7 +116,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -114,9 +124,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -190,7 +207,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -207,7 +234,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -216,9 +242,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -286,13 +319,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/webkit_common.target.linux-mips.mk b/webkit/common/webkit_common.target.linux-mips.mk
index c643e32..ea7ed90 100644
--- a/webkit/common/webkit_common.target.linux-mips.mk
+++ b/webkit/common/webkit_common.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,webkit_webkit_resources_gyp)/webkit_resources.stamp
@@ -88,7 +89,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -104,7 +115,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -113,9 +123,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -188,7 +205,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -205,7 +232,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -214,9 +240,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,13 +313,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/common/webkit_common.target.linux-x86.mk b/webkit/common/webkit_common.target.linux-x86.mk
index 0d544db..3b3e869 100644
--- a/webkit/common/webkit_common.target.linux-x86.mk
+++ b/webkit/common/webkit_common.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,ui_resources_ui_resources_gyp)/ui_resources.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,ui_ui_gyp)/ui_ui_gyp.a \
$(call intermediates-dir-for,GYP,webkit_webkit_resources_gyp)/webkit_resources.stamp
@@ -90,7 +91,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -106,7 +117,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -115,9 +125,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -193,7 +210,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMMON_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
@@ -210,7 +237,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -219,9 +245,16 @@
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -284,13 +317,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_ui_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/glue/glue.target.darwin-arm.mk b/webkit/glue/glue.target.darwin-arm.mk
index 49e549e..51a9910 100644
--- a/webkit/glue/glue.target.darwin-arm.mk
+++ b/webkit/glue/glue.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -92,7 +93,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -114,7 +125,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -126,9 +136,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -218,7 +235,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -241,7 +268,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -253,9 +279,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -336,13 +369,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/glue/glue.target.darwin-mips.mk b/webkit/glue/glue.target.darwin-mips.mk
index 06648fe..a4e0d8d 100644
--- a/webkit/glue/glue.target.darwin-mips.mk
+++ b/webkit/glue/glue.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -91,7 +92,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -113,7 +124,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -125,9 +135,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -216,7 +233,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -239,7 +266,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -251,9 +277,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -330,13 +363,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/glue/glue.target.darwin-x86.mk b/webkit/glue/glue.target.darwin-x86.mk
index f5aab54..e89fe26 100644
--- a/webkit/glue/glue.target.darwin-x86.mk
+++ b/webkit/glue/glue.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -93,7 +94,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -115,7 +126,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -127,9 +137,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -221,7 +238,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -244,7 +271,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -256,9 +282,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -334,13 +367,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/glue/glue.target.linux-arm.mk b/webkit/glue/glue.target.linux-arm.mk
index 49e549e..51a9910 100644
--- a/webkit/glue/glue.target.linux-arm.mk
+++ b/webkit/glue/glue.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -92,7 +93,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -114,7 +125,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -126,9 +136,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -218,7 +235,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -241,7 +268,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -253,9 +279,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -336,13 +369,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/glue/glue.target.linux-mips.mk b/webkit/glue/glue.target.linux-mips.mk
index 06648fe..a4e0d8d 100644
--- a/webkit/glue/glue.target.linux-mips.mk
+++ b/webkit/glue/glue.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -91,7 +92,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -113,7 +124,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -125,9 +135,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -216,7 +233,17 @@
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -239,7 +266,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -251,9 +277,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -330,13 +363,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/glue/glue.target.linux-x86.mk b/webkit/glue/glue.target.linux-x86.mk
index f5aab54..e89fe26 100644
--- a/webkit/glue/glue.target.linux-x86.mk
+++ b/webkit/glue/glue.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
@@ -93,7 +94,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -115,7 +126,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -127,9 +137,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -221,7 +238,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_EXTENSIONS_IMPLEMENTATION' \
'-DWEBKIT_GLUE_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DMESA_EGL_NO_X11_HEADERS' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
@@ -244,7 +271,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -256,9 +282,16 @@
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -334,13 +367,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp \
ui_gl_gl_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-arm.mk b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-arm.mk
index e8e8535..afdd21a 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-arm.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
GYP_GENERATED_OUTPUTS :=
@@ -99,7 +100,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -119,7 +130,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -128,9 +138,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -214,7 +231,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -235,7 +262,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -244,9 +270,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -323,13 +356,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-mips.mk b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-mips.mk
index 6a8c9ee..088f99e 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-mips.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
GYP_GENERATED_OUTPUTS :=
@@ -98,7 +99,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -118,7 +129,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -127,9 +137,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -212,7 +229,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -233,7 +260,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -242,9 +268,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -317,13 +350,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-x86.mk b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-x86.mk
index 5e76b81..4e6a682 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-x86.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.darwin-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
GYP_GENERATED_OUTPUTS :=
@@ -101,7 +102,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -121,7 +132,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -130,9 +140,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -219,7 +236,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -240,7 +267,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -249,9 +275,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -323,13 +356,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-arm.mk b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-arm.mk
index e8e8535..afdd21a 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-arm.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-arm.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
GYP_GENERATED_OUTPUTS :=
@@ -99,7 +100,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -119,7 +130,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -128,9 +138,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -214,7 +231,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -235,7 +262,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -244,9 +270,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -323,13 +356,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-mips.mk b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-mips.mk
index 6a8c9ee..088f99e 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-mips.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-mips.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
GYP_GENERATED_OUTPUTS :=
@@ -98,7 +99,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -118,7 +129,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -127,9 +137,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -212,7 +229,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -233,7 +260,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -242,9 +268,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -317,13 +350,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
index 5e76b81..4e6a682 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
@@ -13,6 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,gpu_gpu_gyp)/gpu.stamp \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
GYP_GENERATED_OUTPUTS :=
@@ -101,7 +102,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -121,7 +132,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -130,9 +140,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -219,7 +236,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_COMPOSITOR_BINDINGS_IMPLEMENTATION=1' \
'-DMEDIA_DISABLE_LIBVPX' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -240,7 +267,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -249,9 +275,16 @@
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
@@ -323,13 +356,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-arm.mk b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-arm.mk
index 3027372..89d2d8c 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-arm.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -92,10 +103,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -103,9 +113,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -174,7 +191,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -190,10 +217,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -201,9 +227,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -267,13 +300,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-mips.mk b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-mips.mk
index be3a8c8..e12f476 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-mips.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -91,10 +102,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -102,9 +112,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -172,7 +189,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -188,10 +215,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -199,9 +225,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -261,13 +294,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-x86.mk b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-x86.mk
index e0c3bb7..4c3e14e 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-x86.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.darwin-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -94,10 +105,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -105,9 +115,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -179,7 +196,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -195,10 +222,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -206,9 +232,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -267,13 +300,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-arm.mk b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-arm.mk
index 3027372..89d2d8c 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-arm.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -77,7 +78,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -92,10 +103,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -103,9 +113,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -174,7 +191,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -190,10 +217,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -201,9 +227,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -267,13 +300,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-mips.mk b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-mips.mk
index be3a8c8..e12f476 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-mips.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -76,7 +77,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -91,10 +102,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -102,9 +112,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -172,7 +189,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -188,10 +215,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -199,9 +225,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -261,13 +294,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-x86.mk b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-x86.mk
index e0c3bb7..4c3e14e 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-x86.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_support.target.linux-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp
+ $(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -79,7 +80,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -94,10 +105,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -105,9 +115,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -179,7 +196,17 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -195,10 +222,9 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/webkit \
$(gyp_shared_intermediate_dir)/webkit \
$(LOCAL_PATH) \
@@ -206,9 +232,16 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(LOCAL_PATH)/third_party/WebKit/Source \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/frameworks/wilhelm/include \
$(PWD)/bionic \
@@ -267,13 +300,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/webkit_renderer.target.darwin-arm.mk b/webkit/renderer/webkit_renderer.target.darwin-arm.mk
index 2c51639..71c1d30 100644
--- a/webkit/renderer/webkit_renderer.target.darwin-arm.mk
+++ b/webkit/renderer/webkit_renderer.target.darwin-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp
@@ -85,7 +86,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -202,7 +219,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -220,7 +247,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -229,9 +255,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -309,13 +342,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/webkit_renderer.target.darwin-mips.mk b/webkit/renderer/webkit_renderer.target.darwin-mips.mk
index 95dba5f..14b36bc 100644
--- a/webkit/renderer/webkit_renderer.target.darwin-mips.mk
+++ b/webkit/renderer/webkit_renderer.target.darwin-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp
@@ -85,7 +86,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -202,7 +219,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -220,7 +247,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -229,9 +255,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -305,13 +338,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/webkit_renderer.target.darwin-x86.mk b/webkit/renderer/webkit_renderer.target.darwin-x86.mk
index c304302..49ecbda 100644
--- a/webkit/renderer/webkit_renderer.target.darwin-x86.mk
+++ b/webkit/renderer/webkit_renderer.target.darwin-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp
@@ -86,7 +87,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -104,7 +115,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -113,9 +123,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -205,7 +222,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -223,7 +250,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -232,9 +258,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -307,13 +340,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/webkit_renderer.target.linux-arm.mk b/webkit/renderer/webkit_renderer.target.linux-arm.mk
index 2c51639..71c1d30 100644
--- a/webkit/renderer/webkit_renderer.target.linux-arm.mk
+++ b/webkit/renderer/webkit_renderer.target.linux-arm.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp
@@ -85,7 +86,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -202,7 +219,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -220,7 +247,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -229,9 +255,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -309,13 +342,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/webkit_renderer.target.linux-mips.mk b/webkit/renderer/webkit_renderer.target.linux-mips.mk
index 95dba5f..14b36bc 100644
--- a/webkit/renderer/webkit_renderer.target.linux-mips.mk
+++ b/webkit/renderer/webkit_renderer.target.linux-mips.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp
@@ -85,7 +86,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -103,7 +114,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -112,9 +122,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -202,7 +219,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -220,7 +247,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -229,9 +255,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -305,13 +338,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/renderer/webkit_renderer.target.linux-x86.mk b/webkit/renderer/webkit_renderer.target.linux-x86.mk
index c304302..49ecbda 100644
--- a/webkit/renderer/webkit_renderer.target.linux-x86.mk
+++ b/webkit/renderer/webkit_renderer.target.linux-x86.mk
@@ -12,6 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,skia_skia_gyp)/skia.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \
$(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
$(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp
@@ -86,7 +87,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -104,7 +115,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -113,9 +123,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -205,7 +222,17 @@
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_RENDERER_IMPLEMENTATION' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -223,7 +250,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -232,9 +258,16 @@
$(LOCAL_PATH)/third_party/WebKit/Source \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(LOCAL_PATH)/third_party/WebKit \
$(LOCAL_PATH)/third_party/npapi \
@@ -307,13 +340,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/webkit_storage_browser.target.darwin-arm.mk b/webkit/webkit_storage_browser.target.darwin-arm.mk
index f6ae49c..a3abcc1 100644
--- a/webkit/webkit_storage_browser.target.darwin-arm.mk
+++ b/webkit/webkit_storage_browser.target.darwin-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -162,7 +163,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -182,7 +193,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -196,9 +206,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -282,7 +299,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -303,7 +330,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -317,9 +343,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -395,13 +428,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/webkit_storage_browser.target.darwin-mips.mk b/webkit/webkit_storage_browser.target.darwin-mips.mk
index a2e1292..f0dc834 100644
--- a/webkit/webkit_storage_browser.target.darwin-mips.mk
+++ b/webkit/webkit_storage_browser.target.darwin-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -161,7 +162,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -181,7 +192,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -195,9 +205,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,7 +297,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -301,7 +328,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -315,9 +341,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -389,13 +422,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/webkit_storage_browser.target.darwin-x86.mk b/webkit/webkit_storage_browser.target.darwin-x86.mk
index a35ab6a..b4cac17 100644
--- a/webkit/webkit_storage_browser.target.darwin-x86.mk
+++ b/webkit/webkit_storage_browser.target.darwin-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -163,7 +164,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -183,7 +194,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -197,9 +207,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -285,7 +302,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -306,7 +333,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -320,9 +346,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -393,13 +426,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/webkit_storage_browser.target.linux-arm.mk b/webkit/webkit_storage_browser.target.linux-arm.mk
index f6ae49c..a3abcc1 100644
--- a/webkit/webkit_storage_browser.target.linux-arm.mk
+++ b/webkit/webkit_storage_browser.target.linux-arm.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -162,7 +163,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -182,7 +193,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -196,9 +206,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -282,7 +299,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -303,7 +330,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -317,9 +343,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -395,13 +428,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/webkit_storage_browser.target.linux-mips.mk b/webkit/webkit_storage_browser.target.linux-mips.mk
index a2e1292..f0dc834 100644
--- a/webkit/webkit_storage_browser.target.linux-mips.mk
+++ b/webkit/webkit_storage_browser.target.linux-mips.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -161,7 +162,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -181,7 +192,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -195,9 +205,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -280,7 +297,17 @@
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
'-DPOSIX_AVOID_MMAP' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -301,7 +328,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -315,9 +341,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -389,13 +422,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/webkit_storage_browser.target.linux-x86.mk b/webkit/webkit_storage_browser.target.linux-x86.mk
index a35ab6a..b4cac17 100644
--- a/webkit/webkit_storage_browser.target.linux-x86.mk
+++ b/webkit/webkit_storage_browser.target.linux-x86.mk
@@ -11,7 +11,8 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp
+ $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_gyp)/blink.stamp \
+ $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -163,7 +164,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -183,7 +194,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -197,9 +207,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -285,7 +302,17 @@
'-DENABLE_MANAGED_USERS=1' \
'-DWEBKIT_STORAGE_BROWSER_IMPLEMENTATION' \
'-DAPPCACHE_USE_SIMPLE_CACHE' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_SUPPORT_GPU=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
+ '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \
+ '-DGR_GL_IGNORE_ES3_MSAA=0' \
+ '-DSK_SUPPORT_LEGACY_PIXELREF_CONSTRUCTOR=1' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
@@ -306,7 +333,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -320,9 +346,16 @@
$(LOCAL_PATH)/third_party/leveldatabase \
$(LOCAL_PATH)/third_party/sqlite \
$(LOCAL_PATH)/third_party/WebKit \
- $(PWD)/external/skia/include \
- $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
$(LOCAL_PATH)/skia/ext \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
@@ -393,13 +426,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES :=
+LOCAL_STATIC_LIBRARIES := \
+ skia_skia_library_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
- libskia \
libstlport \
libdl
diff --git a/webkit/webkit_storage_common.target.darwin-arm.mk b/webkit/webkit_storage_common.target.darwin-arm.mk
index 8fb066e..ef60570 100644
--- a/webkit/webkit_storage_common.target.darwin-arm.mk
+++ b/webkit/webkit_storage_common.target.darwin-arm.mk
@@ -101,7 +101,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -191,7 +190,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/webkit/webkit_storage_common.target.darwin-mips.mk b/webkit/webkit_storage_common.target.darwin-mips.mk
index a0e9034..be238aa 100644
--- a/webkit/webkit_storage_common.target.darwin-mips.mk
+++ b/webkit/webkit_storage_common.target.darwin-mips.mk
@@ -100,7 +100,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -189,7 +188,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/webkit/webkit_storage_common.target.darwin-x86.mk b/webkit/webkit_storage_common.target.darwin-x86.mk
index 526f4de..3c65fc7 100644
--- a/webkit/webkit_storage_common.target.darwin-x86.mk
+++ b/webkit/webkit_storage_common.target.darwin-x86.mk
@@ -102,7 +102,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -194,7 +193,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/webkit/webkit_storage_common.target.linux-arm.mk b/webkit/webkit_storage_common.target.linux-arm.mk
index 8fb066e..ef60570 100644
--- a/webkit/webkit_storage_common.target.linux-arm.mk
+++ b/webkit/webkit_storage_common.target.linux-arm.mk
@@ -101,7 +101,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -191,7 +190,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/webkit/webkit_storage_common.target.linux-mips.mk b/webkit/webkit_storage_common.target.linux-mips.mk
index a0e9034..be238aa 100644
--- a/webkit/webkit_storage_common.target.linux-mips.mk
+++ b/webkit/webkit_storage_common.target.linux-mips.mk
@@ -100,7 +100,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -189,7 +188,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
diff --git a/webkit/webkit_storage_common.target.linux-x86.mk b/webkit/webkit_storage_common.target.linux-x86.mk
index 526f4de..3c65fc7 100644
--- a/webkit/webkit_storage_common.target.linux-x86.mk
+++ b/webkit/webkit_storage_common.target.linux-x86.mk
@@ -102,7 +102,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -194,7 +193,6 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
- $(gyp_shared_intermediate_dir)/shim_headers/skia_library/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
