Revert "Revert "Update makefiles to use system skia.""
Build issues should now be resolved.
This reverts commit d7d5835fcf4aaf94f4a96d0066e6644ede1db6e1.
Change-Id: Ia46ed6ecc51f4d3f4bcc63ed69df19a3f322af24
diff --git a/Source/core/webcore_derived.target.darwin-arm.mk b/Source/core/webcore_derived.target.darwin-arm.mk
index 7c67d96..4682db5 100644
--- a/Source/core/webcore_derived.target.darwin-arm.mk
+++ b/Source/core/webcore_derived.target.darwin-arm.mk
@@ -22,7 +22,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_debugger_script_source_gyp)/debugger_script_source.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_make_platform_derived_sources_gyp)/make_platform_derived_sources.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_libwebp_libwebp_gyp)/webp.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -407,17 +406,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -438,6 +427,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -458,16 +448,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -564,17 +547,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -596,6 +569,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -616,16 +590,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -701,13 +668,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_derived.target.darwin-mips.mk b/Source/core/webcore_derived.target.darwin-mips.mk
index 5f8880c..9b4a015 100644
--- a/Source/core/webcore_derived.target.darwin-mips.mk
+++ b/Source/core/webcore_derived.target.darwin-mips.mk
@@ -22,7 +22,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_debugger_script_source_gyp)/debugger_script_source.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_make_platform_derived_sources_gyp)/make_platform_derived_sources.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_libwebp_libwebp_gyp)/webp.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -406,17 +405,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -437,6 +426,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -457,16 +447,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -562,17 +545,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -594,6 +567,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -614,16 +588,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -695,13 +662,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_derived.target.darwin-x86.mk b/Source/core/webcore_derived.target.darwin-x86.mk
index 7e52eeb..8544b60 100644
--- a/Source/core/webcore_derived.target.darwin-x86.mk
+++ b/Source/core/webcore_derived.target.darwin-x86.mk
@@ -22,7 +22,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_debugger_script_source_gyp)/debugger_script_source.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_make_platform_derived_sources_gyp)/make_platform_derived_sources.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_libwebp_libwebp_gyp)/webp.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -409,17 +408,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -440,6 +429,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -460,16 +450,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -569,17 +552,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -601,6 +574,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -621,16 +595,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -701,13 +668,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_derived.target.linux-arm.mk b/Source/core/webcore_derived.target.linux-arm.mk
index 7c67d96..4682db5 100644
--- a/Source/core/webcore_derived.target.linux-arm.mk
+++ b/Source/core/webcore_derived.target.linux-arm.mk
@@ -22,7 +22,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_debugger_script_source_gyp)/debugger_script_source.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_make_platform_derived_sources_gyp)/make_platform_derived_sources.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_libwebp_libwebp_gyp)/webp.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -407,17 +406,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -438,6 +427,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -458,16 +448,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -564,17 +547,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -596,6 +569,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -616,16 +590,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -701,13 +668,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_derived.target.linux-mips.mk b/Source/core/webcore_derived.target.linux-mips.mk
index 5f8880c..9b4a015 100644
--- a/Source/core/webcore_derived.target.linux-mips.mk
+++ b/Source/core/webcore_derived.target.linux-mips.mk
@@ -22,7 +22,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_debugger_script_source_gyp)/debugger_script_source.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_make_platform_derived_sources_gyp)/make_platform_derived_sources.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_libwebp_libwebp_gyp)/webp.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -406,17 +405,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -437,6 +426,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -457,16 +447,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -562,17 +545,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -594,6 +567,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -614,16 +588,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -695,13 +662,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_derived.target.linux-x86.mk b/Source/core/webcore_derived.target.linux-x86.mk
index 7e52eeb..8544b60 100644
--- a/Source/core/webcore_derived.target.linux-x86.mk
+++ b/Source/core/webcore_derived.target.linux-x86.mk
@@ -22,7 +22,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_debugger_script_source_gyp)/debugger_script_source.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_make_platform_derived_sources_gyp)/make_platform_derived_sources.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_libwebp_libwebp_gyp)/webp.stamp \
$(call intermediates-dir-for,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -409,17 +408,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -440,6 +429,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -460,16 +450,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -569,17 +552,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -601,6 +574,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/blink \
@@ -621,16 +595,9 @@
$(LOCAL_PATH)/third_party/zlib \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -701,13 +668,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_dom.target.darwin-arm.mk b/Source/core/webcore_dom.target.darwin-arm.mk
index 3ca6d25..41ef651 100644
--- a/Source/core/webcore_dom.target.darwin-arm.mk
+++ b/Source/core/webcore_dom.target.darwin-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -267,17 +266,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -298,6 +287,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -311,16 +301,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -419,17 +402,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -451,6 +424,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -464,16 +438,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -551,13 +518,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_dom.target.darwin-mips.mk b/Source/core/webcore_dom.target.darwin-mips.mk
index 29a6c89..dabbcdc 100644
--- a/Source/core/webcore_dom.target.darwin-mips.mk
+++ b/Source/core/webcore_dom.target.darwin-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -266,17 +265,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -297,6 +286,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -310,16 +300,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -417,17 +400,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -449,6 +422,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -462,16 +436,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -545,13 +512,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_dom.target.darwin-x86.mk b/Source/core/webcore_dom.target.darwin-x86.mk
index 7802986..1e5a83a 100644
--- a/Source/core/webcore_dom.target.darwin-x86.mk
+++ b/Source/core/webcore_dom.target.darwin-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -269,17 +268,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -300,6 +289,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -313,16 +303,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -424,17 +407,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -456,6 +429,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -469,16 +443,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -551,13 +518,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_dom.target.linux-arm.mk b/Source/core/webcore_dom.target.linux-arm.mk
index 3ca6d25..41ef651 100644
--- a/Source/core/webcore_dom.target.linux-arm.mk
+++ b/Source/core/webcore_dom.target.linux-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -267,17 +266,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -298,6 +287,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -311,16 +301,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -419,17 +402,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -451,6 +424,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -464,16 +438,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -551,13 +518,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_dom.target.linux-mips.mk b/Source/core/webcore_dom.target.linux-mips.mk
index 29a6c89..dabbcdc 100644
--- a/Source/core/webcore_dom.target.linux-mips.mk
+++ b/Source/core/webcore_dom.target.linux-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -266,17 +265,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -297,6 +286,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -310,16 +300,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -417,17 +400,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -449,6 +422,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -462,16 +436,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -545,13 +512,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_dom.target.linux-x86.mk b/Source/core/webcore_dom.target.linux-x86.mk
index 7802986..1e5a83a 100644
--- a/Source/core/webcore_dom.target.linux-x86.mk
+++ b/Source/core/webcore_dom.target.linux-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -269,17 +268,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -300,6 +289,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -313,16 +303,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -424,17 +407,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -456,6 +429,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -469,16 +443,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -551,13 +518,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_html.target.darwin-arm.mk b/Source/core/webcore_html.target.darwin-arm.mk
index c626669..dc4b56a 100644
--- a/Source/core/webcore_html.target.darwin-arm.mk
+++ b/Source/core/webcore_html.target.darwin-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -352,17 +351,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -383,6 +372,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -396,16 +386,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -504,17 +487,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -536,6 +509,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -549,16 +523,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -636,13 +603,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_html.target.darwin-mips.mk b/Source/core/webcore_html.target.darwin-mips.mk
index 0d669a1..9ce3f13 100644
--- a/Source/core/webcore_html.target.darwin-mips.mk
+++ b/Source/core/webcore_html.target.darwin-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -351,17 +350,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -382,6 +371,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -395,16 +385,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -502,17 +485,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -534,6 +507,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -547,16 +521,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -630,13 +597,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_html.target.darwin-x86.mk b/Source/core/webcore_html.target.darwin-x86.mk
index 331a907..3e58a66 100644
--- a/Source/core/webcore_html.target.darwin-x86.mk
+++ b/Source/core/webcore_html.target.darwin-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -354,17 +353,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -385,6 +374,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -398,16 +388,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -509,17 +492,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -541,6 +514,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -554,16 +528,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -636,13 +603,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_html.target.linux-arm.mk b/Source/core/webcore_html.target.linux-arm.mk
index c626669..dc4b56a 100644
--- a/Source/core/webcore_html.target.linux-arm.mk
+++ b/Source/core/webcore_html.target.linux-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -352,17 +351,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -383,6 +372,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -396,16 +386,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -504,17 +487,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -536,6 +509,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -549,16 +523,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -636,13 +603,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_html.target.linux-mips.mk b/Source/core/webcore_html.target.linux-mips.mk
index 0d669a1..9ce3f13 100644
--- a/Source/core/webcore_html.target.linux-mips.mk
+++ b/Source/core/webcore_html.target.linux-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -351,17 +350,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -382,6 +371,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -395,16 +385,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -502,17 +485,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -534,6 +507,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -547,16 +521,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -630,13 +597,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_html.target.linux-x86.mk b/Source/core/webcore_html.target.linux-x86.mk
index 331a907..3e58a66 100644
--- a/Source/core/webcore_html.target.linux-x86.mk
+++ b/Source/core/webcore_html.target.linux-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -354,17 +353,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -385,6 +374,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -398,16 +388,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -509,17 +492,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -541,6 +514,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -554,16 +528,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -636,13 +603,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_platform.target.darwin-arm.mk b/Source/core/webcore_platform.target.darwin-arm.mk
index 3f8a95b..5fe4a97 100644
--- a/Source/core/webcore_platform.target.darwin-arm.mk
+++ b/Source/core/webcore_platform.target.darwin-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -106,17 +105,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -137,6 +126,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -150,16 +140,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -258,17 +241,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -290,6 +263,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -303,16 +277,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -390,13 +357,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_platform.target.darwin-mips.mk b/Source/core/webcore_platform.target.darwin-mips.mk
index 59933b1..362da5b 100644
--- a/Source/core/webcore_platform.target.darwin-mips.mk
+++ b/Source/core/webcore_platform.target.darwin-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -105,17 +104,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -136,6 +125,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -149,16 +139,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -256,17 +239,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -288,6 +261,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -301,16 +275,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -384,13 +351,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_platform.target.darwin-x86.mk b/Source/core/webcore_platform.target.darwin-x86.mk
index 11b3d39..4dace09 100644
--- a/Source/core/webcore_platform.target.darwin-x86.mk
+++ b/Source/core/webcore_platform.target.darwin-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -108,17 +107,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -139,6 +128,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -152,16 +142,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -263,17 +246,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -295,6 +268,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -308,16 +282,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -390,13 +357,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_platform.target.linux-arm.mk b/Source/core/webcore_platform.target.linux-arm.mk
index 3f8a95b..5fe4a97 100644
--- a/Source/core/webcore_platform.target.linux-arm.mk
+++ b/Source/core/webcore_platform.target.linux-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -106,17 +105,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -137,6 +126,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -150,16 +140,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -258,17 +241,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -290,6 +263,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -303,16 +277,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -390,13 +357,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_platform.target.linux-mips.mk b/Source/core/webcore_platform.target.linux-mips.mk
index 59933b1..362da5b 100644
--- a/Source/core/webcore_platform.target.linux-mips.mk
+++ b/Source/core/webcore_platform.target.linux-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -105,17 +104,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -136,6 +125,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -149,16 +139,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -256,17 +239,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -288,6 +261,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -301,16 +275,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -384,13 +351,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_platform.target.linux-x86.mk b/Source/core/webcore_platform.target.linux-x86.mk
index 11b3d39..4dace09 100644
--- a/Source/core/webcore_platform.target.linux-x86.mk
+++ b/Source/core/webcore_platform.target.linux-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -108,17 +107,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -139,6 +128,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -152,16 +142,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -263,17 +246,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -295,6 +268,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -308,16 +282,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -390,13 +357,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_remaining.target.darwin-arm.mk b/Source/core/webcore_remaining.target.darwin-arm.mk
index ede936c..a0d07e3 100644
--- a/Source/core/webcore_remaining.target.darwin-arm.mk
+++ b/Source/core/webcore_remaining.target.darwin-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -603,17 +602,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -634,6 +623,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -647,16 +637,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -756,17 +739,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -788,6 +761,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -801,16 +775,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -888,13 +855,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_remaining.target.darwin-mips.mk b/Source/core/webcore_remaining.target.darwin-mips.mk
index 01932c6..4b920bb 100644
--- a/Source/core/webcore_remaining.target.darwin-mips.mk
+++ b/Source/core/webcore_remaining.target.darwin-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -602,17 +601,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -633,6 +622,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -646,16 +636,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -754,17 +737,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -786,6 +759,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -799,16 +773,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -882,13 +849,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_remaining.target.darwin-x86.mk b/Source/core/webcore_remaining.target.darwin-x86.mk
index fca1ed6..307d083 100644
--- a/Source/core/webcore_remaining.target.darwin-x86.mk
+++ b/Source/core/webcore_remaining.target.darwin-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -605,17 +604,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -636,6 +625,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -649,16 +639,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -761,17 +744,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -793,6 +766,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -806,16 +780,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -888,13 +855,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_remaining.target.linux-arm.mk b/Source/core/webcore_remaining.target.linux-arm.mk
index ede936c..a0d07e3 100644
--- a/Source/core/webcore_remaining.target.linux-arm.mk
+++ b/Source/core/webcore_remaining.target.linux-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -603,17 +602,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -634,6 +623,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -647,16 +637,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -756,17 +739,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -788,6 +761,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -801,16 +775,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -888,13 +855,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_remaining.target.linux-mips.mk b/Source/core/webcore_remaining.target.linux-mips.mk
index 01932c6..4b920bb 100644
--- a/Source/core/webcore_remaining.target.linux-mips.mk
+++ b/Source/core/webcore_remaining.target.linux-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -602,17 +601,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -633,6 +622,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -646,16 +636,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -754,17 +737,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -786,6 +759,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -799,16 +773,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -882,13 +849,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_remaining.target.linux-x86.mk b/Source/core/webcore_remaining.target.linux-x86.mk
index fca1ed6..307d083 100644
--- a/Source/core/webcore_remaining.target.linux-x86.mk
+++ b/Source/core/webcore_remaining.target.linux-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -605,17 +604,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -636,6 +625,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -649,16 +639,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -761,17 +744,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -793,6 +766,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -806,16 +780,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -888,13 +855,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_rendering.target.darwin-arm.mk b/Source/core/webcore_rendering.target.darwin-arm.mk
index fa3557c..4154bf5 100644
--- a/Source/core/webcore_rendering.target.darwin-arm.mk
+++ b/Source/core/webcore_rendering.target.darwin-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -260,17 +259,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -291,6 +280,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -304,16 +294,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -412,17 +395,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -444,6 +417,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -457,16 +431,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -544,13 +511,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_rendering.target.darwin-mips.mk b/Source/core/webcore_rendering.target.darwin-mips.mk
index 7c1366c..c2fede0 100644
--- a/Source/core/webcore_rendering.target.darwin-mips.mk
+++ b/Source/core/webcore_rendering.target.darwin-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -259,17 +258,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -290,6 +279,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -303,16 +293,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -410,17 +393,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -442,6 +415,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -455,16 +429,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -538,13 +505,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_rendering.target.darwin-x86.mk b/Source/core/webcore_rendering.target.darwin-x86.mk
index 8446d65..d753bbd 100644
--- a/Source/core/webcore_rendering.target.darwin-x86.mk
+++ b/Source/core/webcore_rendering.target.darwin-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -263,17 +262,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -294,6 +283,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -307,16 +297,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -419,17 +402,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -451,6 +424,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -464,16 +438,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -546,13 +513,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_rendering.target.linux-arm.mk b/Source/core/webcore_rendering.target.linux-arm.mk
index fa3557c..4154bf5 100644
--- a/Source/core/webcore_rendering.target.linux-arm.mk
+++ b/Source/core/webcore_rendering.target.linux-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -260,17 +259,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -291,6 +280,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -304,16 +294,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -412,17 +395,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -444,6 +417,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -457,16 +431,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -544,13 +511,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_rendering.target.linux-mips.mk b/Source/core/webcore_rendering.target.linux-mips.mk
index 7c1366c..c2fede0 100644
--- a/Source/core/webcore_rendering.target.linux-mips.mk
+++ b/Source/core/webcore_rendering.target.linux-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -259,17 +258,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -290,6 +279,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -303,16 +293,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -410,17 +393,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -442,6 +415,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -455,16 +429,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -538,13 +505,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_rendering.target.linux-x86.mk b/Source/core/webcore_rendering.target.linux-x86.mk
index 8446d65..d753bbd 100644
--- a/Source/core/webcore_rendering.target.linux-x86.mk
+++ b/Source/core/webcore_rendering.target.linux-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -263,17 +262,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -294,6 +283,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -307,16 +297,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -419,17 +402,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -451,6 +424,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -464,16 +438,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -546,13 +513,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_svg.target.darwin-arm.mk b/Source/core/webcore_svg.target.darwin-arm.mk
index f5f985c..d07e6ac 100644
--- a/Source/core/webcore_svg.target.darwin-arm.mk
+++ b/Source/core/webcore_svg.target.darwin-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -309,17 +308,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -340,6 +329,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -353,16 +343,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -461,17 +444,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -493,6 +466,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -506,16 +480,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -593,13 +560,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_svg.target.darwin-mips.mk b/Source/core/webcore_svg.target.darwin-mips.mk
index 7903eaf..1039fcc 100644
--- a/Source/core/webcore_svg.target.darwin-mips.mk
+++ b/Source/core/webcore_svg.target.darwin-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -308,17 +307,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -339,6 +328,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -352,16 +342,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -459,17 +442,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -491,6 +464,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -504,16 +478,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -587,13 +554,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_svg.target.darwin-x86.mk b/Source/core/webcore_svg.target.darwin-x86.mk
index 77e3e4f..9d59f01 100644
--- a/Source/core/webcore_svg.target.darwin-x86.mk
+++ b/Source/core/webcore_svg.target.darwin-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -311,17 +310,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -342,6 +331,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -355,16 +345,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -466,17 +449,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -498,6 +471,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -511,16 +485,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -593,13 +560,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_svg.target.linux-arm.mk b/Source/core/webcore_svg.target.linux-arm.mk
index f5f985c..d07e6ac 100644
--- a/Source/core/webcore_svg.target.linux-arm.mk
+++ b/Source/core/webcore_svg.target.linux-arm.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -309,17 +308,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -340,6 +329,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -353,16 +343,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -461,17 +444,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -493,6 +466,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -506,16 +480,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -593,13 +560,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_svg.target.linux-mips.mk b/Source/core/webcore_svg.target.linux-mips.mk
index 7903eaf..1039fcc 100644
--- a/Source/core/webcore_svg.target.linux-mips.mk
+++ b/Source/core/webcore_svg.target.linux-mips.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -308,17 +307,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -339,6 +328,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -352,16 +342,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -459,17 +442,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -491,6 +464,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -504,16 +478,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -587,13 +554,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/core/webcore_svg.target.linux-x86.mk b/Source/core/webcore_svg.target.linux-x86.mk
index 77e3e4f..9d59f01 100644
--- a/Source/core/webcore_svg.target.linux-x86.mk
+++ b/Source/core/webcore_svg.target.linux-x86.mk
@@ -11,8 +11,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
- $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_prerequisites_gyp)/webcore_prerequisites.stamp
GYP_GENERATED_OUTPUTS :=
@@ -311,17 +310,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -342,6 +331,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -355,16 +345,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -466,17 +449,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
'-DCHROME_PNG_WRITE_SUPPORT' \
'-DPNG_USER_CONFIG' \
'-DCHROME_PNG_READ_PACK_SUPPORT' \
@@ -498,6 +471,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -511,16 +485,9 @@
$(LOCAL_PATH)/third_party/angle/include \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/iccjpeg \
$(LOCAL_PATH)/third_party/libpng \
@@ -593,13 +560,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/modules/modules.target.darwin-arm.mk b/Source/modules/modules.target.darwin-arm.mk
index a318de8..75cc6aa 100644
--- a/Source/modules/modules.target.darwin-arm.mk
+++ b/Source/modules/modules.target.darwin-arm.mk
@@ -13,8 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -362,17 +361,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -388,6 +377,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -402,16 +392,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -501,17 +484,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -528,6 +501,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -542,16 +516,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -621,13 +588,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/modules/modules.target.darwin-mips.mk b/Source/modules/modules.target.darwin-mips.mk
index 046bae4..bbfbfe6 100644
--- a/Source/modules/modules.target.darwin-mips.mk
+++ b/Source/modules/modules.target.darwin-mips.mk
@@ -13,8 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -361,17 +360,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -387,6 +376,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -401,16 +391,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -499,17 +482,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -526,6 +499,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -540,16 +514,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -615,13 +582,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/modules/modules.target.darwin-x86.mk b/Source/modules/modules.target.darwin-x86.mk
index 138e6a7..d5053b3 100644
--- a/Source/modules/modules.target.darwin-x86.mk
+++ b/Source/modules/modules.target.darwin-x86.mk
@@ -13,8 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -364,17 +363,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -390,6 +379,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -404,16 +394,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -506,17 +489,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -533,6 +506,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -547,16 +521,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -621,13 +588,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/modules/modules.target.linux-arm.mk b/Source/modules/modules.target.linux-arm.mk
index a318de8..75cc6aa 100644
--- a/Source/modules/modules.target.linux-arm.mk
+++ b/Source/modules/modules.target.linux-arm.mk
@@ -13,8 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -362,17 +361,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -388,6 +377,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -402,16 +392,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -501,17 +484,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -528,6 +501,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -542,16 +516,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -621,13 +588,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/modules/modules.target.linux-mips.mk b/Source/modules/modules.target.linux-mips.mk
index 046bae4..bbfbfe6 100644
--- a/Source/modules/modules.target.linux-mips.mk
+++ b/Source/modules/modules.target.linux-mips.mk
@@ -13,8 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -361,17 +360,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -387,6 +376,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -401,16 +391,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -499,17 +482,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -526,6 +499,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -540,16 +514,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -615,13 +582,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/modules/modules.target.linux-x86.mk b/Source/modules/modules.target.linux-x86.mk
index 138e6a7..d5053b3 100644
--- a/Source/modules/modules.target.linux-x86.mk
+++ b/Source/modules/modules.target.linux-x86.mk
@@ -13,8 +13,7 @@
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
- $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
- $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a
+ $(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a
GYP_GENERATED_OUTPUTS :=
@@ -364,17 +363,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -390,6 +379,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -404,16 +394,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -506,17 +489,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -533,6 +506,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
@@ -547,16 +521,9 @@
$(gyp_shared_intermediate_dir)/blink/bindings \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_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/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -621,13 +588,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_arm_neon.target.darwin-arm.mk b/Source/platform/blink_arm_neon.target.darwin-arm.mk
index e731def..4a052ac 100644
--- a/Source/platform/blink_arm_neon.target.darwin-arm.mk
+++ b/Source/platform/blink_arm_neon.target.darwin-arm.mk
@@ -10,8 +10,7 @@
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# 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
+GYP_TARGET_DEPENDENCIES :=
GYP_GENERATED_OUTPUTS :=
@@ -79,17 +78,7 @@
'-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' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -103,21 +92,15 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(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 \
@@ -191,17 +174,7 @@
'-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' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -215,21 +188,15 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(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 \
@@ -294,13 +261,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_arm_neon.target.linux-arm.mk b/Source/platform/blink_arm_neon.target.linux-arm.mk
index e731def..4a052ac 100644
--- a/Source/platform/blink_arm_neon.target.linux-arm.mk
+++ b/Source/platform/blink_arm_neon.target.linux-arm.mk
@@ -10,8 +10,7 @@
gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared)
# 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
+GYP_TARGET_DEPENDENCIES :=
GYP_GENERATED_OUTPUTS :=
@@ -79,17 +78,7 @@
'-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' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -103,21 +92,15 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(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 \
@@ -191,17 +174,7 @@
'-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' \
'-DANDROID' \
'-D__GNU_SOURCE=1' \
'-DUSE_STLPORT=1' \
@@ -215,21 +188,15 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/Source \
$(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 \
@@ -294,13 +261,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_common.target.darwin-arm.mk b/Source/platform/blink_common.target.darwin-arm.mk
index e83baa8..75c1dcd 100644
--- a/Source/platform/blink_common.target.darwin-arm.mk
+++ b/Source/platform/blink_common.target.darwin-arm.mk
@@ -12,8 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.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,skia_skia_gyp)/skia.stamp
GYP_GENERATED_OUTPUTS :=
@@ -96,17 +95,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -122,6 +111,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -130,16 +120,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -225,17 +208,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -252,6 +225,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -260,16 +234,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -334,13 +301,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_common.target.darwin-mips.mk b/Source/platform/blink_common.target.darwin-mips.mk
index 23a6c24..1f1d644 100644
--- a/Source/platform/blink_common.target.darwin-mips.mk
+++ b/Source/platform/blink_common.target.darwin-mips.mk
@@ -12,8 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.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,skia_skia_gyp)/skia.stamp
GYP_GENERATED_OUTPUTS :=
@@ -95,17 +94,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -121,6 +110,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -129,16 +119,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -223,17 +206,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -250,6 +223,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -258,16 +232,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -328,13 +295,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_common.target.darwin-x86.mk b/Source/platform/blink_common.target.darwin-x86.mk
index ac2a6f7..ab6eb18 100644
--- a/Source/platform/blink_common.target.darwin-x86.mk
+++ b/Source/platform/blink_common.target.darwin-x86.mk
@@ -12,8 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.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,skia_skia_gyp)/skia.stamp
GYP_GENERATED_OUTPUTS :=
@@ -98,17 +97,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -124,6 +113,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -132,16 +122,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -230,17 +213,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -257,6 +230,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -265,16 +239,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -334,13 +301,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_common.target.linux-arm.mk b/Source/platform/blink_common.target.linux-arm.mk
index e83baa8..75c1dcd 100644
--- a/Source/platform/blink_common.target.linux-arm.mk
+++ b/Source/platform/blink_common.target.linux-arm.mk
@@ -12,8 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.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,skia_skia_gyp)/skia.stamp
GYP_GENERATED_OUTPUTS :=
@@ -96,17 +95,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -122,6 +111,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -130,16 +120,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -225,17 +208,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -252,6 +225,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -260,16 +234,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -334,13 +301,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_common.target.linux-mips.mk b/Source/platform/blink_common.target.linux-mips.mk
index 23a6c24..1f1d644 100644
--- a/Source/platform/blink_common.target.linux-mips.mk
+++ b/Source/platform/blink_common.target.linux-mips.mk
@@ -12,8 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.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,skia_skia_gyp)/skia.stamp
GYP_GENERATED_OUTPUTS :=
@@ -95,17 +94,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -121,6 +110,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -129,16 +119,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -223,17 +206,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -250,6 +223,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -258,16 +232,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -328,13 +295,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_common.target.linux-x86.mk b/Source/platform/blink_common.target.linux-x86.mk
index ac2a6f7..ab6eb18 100644
--- a/Source/platform/blink_common.target.linux-x86.mk
+++ b/Source/platform/blink_common.target.linux-x86.mk
@@ -12,8 +12,7 @@
# Make sure our deps are built first.
GYP_TARGET_DEPENDENCIES := \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.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,skia_skia_gyp)/skia.stamp
GYP_GENERATED_OUTPUTS :=
@@ -98,17 +97,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -124,6 +113,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -132,16 +122,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -230,17 +213,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -257,6 +230,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH) \
@@ -265,16 +239,9 @@
$(LOCAL_PATH)/third_party/WebKit \
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
+ $(PWD)/external/skia/include \
+ $(PWD)/external/skia/include/core \
$(LOCAL_PATH)/third_party/skia/src/core \
- $(LOCAL_PATH)/third_party/skia/include/core \
- $(LOCAL_PATH)/third_party/skia/include/effects \
- $(LOCAL_PATH)/third_party/skia/include/pdf \
- $(LOCAL_PATH)/third_party/skia/include/gpu \
- $(LOCAL_PATH)/third_party/skia/include/lazy \
- $(LOCAL_PATH)/third_party/skia/include/pathops \
- $(LOCAL_PATH)/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 \
@@ -334,13 +301,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_platform.target.darwin-arm.mk b/Source/platform/blink_platform.target.darwin-arm.mk
index 62b323a..ea4d25f 100644
--- a/Source/platform/blink_platform.target.darwin-arm.mk
+++ b/Source/platform/blink_platform.target.darwin-arm.mk
@@ -14,7 +14,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_blink_prerequisites_gyp)/blink_prerequisites.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,GYP,third_party_libwebp_libwebp_gyp)/webp.stamp \
@@ -479,17 +478,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -510,6 +499,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -520,16 +510,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -625,17 +608,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -657,6 +630,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -667,16 +641,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -753,13 +720,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp \
third_party_WebKit_Source_platform_blink_arm_neon_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_platform.target.darwin-mips.mk b/Source/platform/blink_platform.target.darwin-mips.mk
index c11aec4..55b44b4 100644
--- a/Source/platform/blink_platform.target.darwin-mips.mk
+++ b/Source/platform/blink_platform.target.darwin-mips.mk
@@ -14,7 +14,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_blink_prerequisites_gyp)/blink_prerequisites.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,GYP,third_party_libwebp_libwebp_gyp)/webp.stamp \
@@ -477,17 +476,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -508,6 +497,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -518,16 +508,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -622,17 +605,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -654,6 +627,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -664,16 +638,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -745,13 +712,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_platform.target.darwin-x86.mk b/Source/platform/blink_platform.target.darwin-x86.mk
index 2156c25..6b8897b 100644
--- a/Source/platform/blink_platform.target.darwin-x86.mk
+++ b/Source/platform/blink_platform.target.darwin-x86.mk
@@ -14,7 +14,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_blink_prerequisites_gyp)/blink_prerequisites.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,GYP,third_party_libwebp_libwebp_gyp)/webp.stamp \
@@ -480,17 +479,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -511,6 +500,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -521,16 +511,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -629,17 +612,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -661,6 +634,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -671,16 +645,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -751,13 +718,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_platform.target.linux-arm.mk b/Source/platform/blink_platform.target.linux-arm.mk
index 62b323a..ea4d25f 100644
--- a/Source/platform/blink_platform.target.linux-arm.mk
+++ b/Source/platform/blink_platform.target.linux-arm.mk
@@ -14,7 +14,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_blink_prerequisites_gyp)/blink_prerequisites.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,GYP,third_party_libwebp_libwebp_gyp)/webp.stamp \
@@ -479,17 +478,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -510,6 +499,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -520,16 +510,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -625,17 +608,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -657,6 +630,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -667,16 +641,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -753,13 +720,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp \
third_party_WebKit_Source_platform_blink_arm_neon_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_platform.target.linux-mips.mk b/Source/platform/blink_platform.target.linux-mips.mk
index c11aec4..55b44b4 100644
--- a/Source/platform/blink_platform.target.linux-mips.mk
+++ b/Source/platform/blink_platform.target.linux-mips.mk
@@ -14,7 +14,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_blink_prerequisites_gyp)/blink_prerequisites.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,GYP,third_party_libwebp_libwebp_gyp)/webp.stamp \
@@ -477,17 +476,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -508,6 +497,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -518,16 +508,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -622,17 +605,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -654,6 +627,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -664,16 +638,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -745,13 +712,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/platform/blink_platform.target.linux-x86.mk b/Source/platform/blink_platform.target.linux-x86.mk
index 2156c25..6b8897b 100644
--- a/Source/platform/blink_platform.target.linux-x86.mk
+++ b/Source/platform/blink_platform.target.linux-x86.mk
@@ -14,7 +14,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_config_gyp)/config.stamp \
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_platform_blink_prerequisites_gyp)/blink_prerequisites.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,GYP,third_party_libwebp_libwebp_gyp)/webp.stamp \
@@ -480,17 +479,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -511,6 +500,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -521,16 +511,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -629,17 +612,7 @@
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -661,6 +634,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/angle/include \
@@ -671,16 +645,9 @@
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
$(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 \
@@ -751,13 +718,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-LOCAL_STATIC_LIBRARIES := \
- skia_skia_library_gyp
+LOCAL_STATIC_LIBRARIES :=
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/web/webkit.target.darwin-arm.mk b/Source/web/webkit.target.darwin-arm.mk
index a62d7ff..57c4943 100644
--- a/Source/web/webkit.target.darwin-arm.mk
+++ b/Source/web/webkit.target.darwin-arm.mk
@@ -15,7 +15,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
$(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,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -333,17 +332,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -359,6 +348,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -378,15 +368,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -476,17 +460,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -503,6 +477,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -522,15 +497,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -600,13 +569,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/web/webkit.target.darwin-mips.mk b/Source/web/webkit.target.darwin-mips.mk
index 0ea3ad2..8e244b2 100644
--- a/Source/web/webkit.target.darwin-mips.mk
+++ b/Source/web/webkit.target.darwin-mips.mk
@@ -15,7 +15,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
$(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,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -332,17 +331,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -358,6 +347,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -377,15 +367,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -474,17 +458,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -501,6 +475,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -520,15 +495,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -594,13 +563,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/web/webkit.target.darwin-x86.mk b/Source/web/webkit.target.darwin-x86.mk
index 0caf281..8517b9c 100644
--- a/Source/web/webkit.target.darwin-x86.mk
+++ b/Source/web/webkit.target.darwin-x86.mk
@@ -15,7 +15,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
$(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,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -335,17 +334,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -361,6 +350,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -380,15 +370,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -481,17 +465,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -508,6 +482,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -527,15 +502,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -600,13 +569,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/web/webkit.target.linux-arm.mk b/Source/web/webkit.target.linux-arm.mk
index a62d7ff..57c4943 100644
--- a/Source/web/webkit.target.linux-arm.mk
+++ b/Source/web/webkit.target.linux-arm.mk
@@ -15,7 +15,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
$(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,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -333,17 +332,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -359,6 +348,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -378,15 +368,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -476,17 +460,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -503,6 +477,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -522,15 +497,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -600,13 +569,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/web/webkit.target.linux-mips.mk b/Source/web/webkit.target.linux-mips.mk
index 0ea3ad2..8e244b2 100644
--- a/Source/web/webkit.target.linux-mips.mk
+++ b/Source/web/webkit.target.linux-mips.mk
@@ -15,7 +15,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
$(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,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -332,17 +331,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -358,6 +347,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -377,15 +367,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -474,17 +458,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -501,6 +475,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -520,15 +495,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -594,13 +563,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
diff --git a/Source/web/webkit.target.linux-x86.mk b/Source/web/webkit.target.linux-x86.mk
index 0caf281..8517b9c 100644
--- a/Source/web/webkit.target.linux-x86.mk
+++ b/Source/web/webkit.target.linux-x86.mk
@@ -15,7 +15,6 @@
$(call intermediates-dir-for,GYP,third_party_WebKit_Source_core_webcore_gyp)/webcore.stamp \
$(call intermediates-dir-for,STATIC_LIBRARIES,third_party_WebKit_Source_core_webcore_derived_gyp)/third_party_WebKit_Source_core_webcore_derived_gyp.a \
$(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,GYP,third_party_npapi_npapi_gyp)/npapi.stamp \
$(call intermediates-dir-for,GYP,v8_tools_gyp_v8_gyp)/v8.stamp
@@ -335,17 +334,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -361,6 +350,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -380,15 +370,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -481,17 +465,7 @@
'-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
'-DENABLE_OPENTYPE_VERTICAL=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' \
@@ -508,6 +482,7 @@
# 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 \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(LOCAL_PATH)/third_party/WebKit/public/web \
@@ -527,15 +502,9 @@
$(PWD)/external/icu4c/common \
$(PWD)/external/icu4c/i18n \
$(LOCAL_PATH)/third_party/qcms/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)/skia/ext \
$(LOCAL_PATH)/third_party/npapi \
$(LOCAL_PATH)/third_party/npapi/bindings \
@@ -600,13 +569,13 @@
LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
LOCAL_STATIC_LIBRARIES := \
- third_party_WebKit_Source_core_webcore_derived_gyp \
- skia_skia_library_gyp
+ third_party_WebKit_Source_core_webcore_derived_gyp
# Enable grouping to fix circular references
LOCAL_GROUP_STATIC_LIBRARIES := true
LOCAL_SHARED_LIBRARIES := \
+ libskia \
libstlport \
libdl
