diff options
| author | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
| commit | effb81e5f8246d0db0270817048dc992db66e9fb (patch) | |
| tree | cc45ced7dfde038c8f3d022ee1eeac207a68761e /skia | |
| parent | 4d26337013537c1acafbcb63b9b2b7e404c3adc9 (diff) | |
| download | chromium_org-effb81e5f8246d0db0270817048dc992db66e9fb.tar.gz | |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
Diffstat (limited to 'skia')
46 files changed, 4255 insertions, 133 deletions
diff --git a/skia/ext/analysis_canvas.cc b/skia/ext/analysis_canvas.cc index 2cd74d87b9..524fd18235 100644 --- a/skia/ext/analysis_canvas.cc +++ b/skia/ext/analysis_canvas.cc @@ -40,7 +40,7 @@ bool IsSolidColorPaint(const SkPaint& paint) { // Returns true if the specified drawn_rect will cover the entire canvas, and // that the canvas is not clipped (i.e. it covers ALL of the canvas). bool IsFullQuad(SkCanvas* canvas, const SkRect& drawn_rect) { - if (SkCanvas::kRect_ClipType != canvas->getClipType()) + if (!canvas->isClipRect()) return false; SkIRect clip_irect; diff --git a/skia/ext/analysis_canvas_unittest.cc b/skia/ext/analysis_canvas_unittest.cc index bc7405354a..2b668c5688 100644 --- a/skia/ext/analysis_canvas_unittest.cc +++ b/skia/ext/analysis_canvas_unittest.cc @@ -235,7 +235,7 @@ TEST(AnalysisCanvasTest, SaveLayerRestore) { paint.setXfermodeMode(SkXfermode::kSrcOver_Mode); // This should force non-transparency - canvas.saveLayer(&bounds, &paint, SkCanvas::kMatrix_SaveFlag); + canvas.saveLayer(&bounds, &paint); EXPECT_TRUE(canvas.GetColorIfSolid(&outputColor)); EXPECT_NE(static_cast<SkColor>(SK_ColorTRANSPARENT), outputColor); @@ -249,7 +249,7 @@ TEST(AnalysisCanvasTest, SaveLayerRestore) { paint.setXfermodeMode(SkXfermode::kDst_Mode); // This should force non-solid color - canvas.saveLayer(&bounds, &paint, SkCanvas::kMatrix_SaveFlag); + canvas.saveLayer(&bounds, &paint); EXPECT_FALSE(canvas.GetColorIfSolid(&outputColor)); TransparentFill(canvas); diff --git a/skia/ext/pixel_ref_utils.cc b/skia/ext/pixel_ref_utils.cc index 26aef37ab6..22d42e7a5a 100644 --- a/skia/ext/pixel_ref_utils.cc +++ b/skia/ext/pixel_ref_utils.cc @@ -14,6 +14,7 @@ #include "third_party/skia/include/core/SkRRect.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkShader.h" +#include "third_party/skia/include/utils/SkNoSaveLayerCanvas.h" #include "third_party/skia/src/core/SkRasterClip.h" namespace skia { @@ -313,12 +314,23 @@ class GatherPixelRefDevice : public SkBitmapDevice { const SkPaint&) SK_OVERRIDE {} protected: +#ifdef SK_SUPPORT_LEGACY_READPIXELSCONFIG virtual bool onReadPixels(const SkBitmap& bitmap, int x, int y, SkCanvas::Config8888 config8888) SK_OVERRIDE { return false; } +#endif + + virtual bool onReadPixels(const SkImageInfo& info, + void* pixels, + size_t rowBytes, + int x, + int y) SK_OVERRIDE { + return false; + } + virtual bool onWritePixels(const SkImageInfo& info, const void* pixels, size_t rowBytes, @@ -349,42 +361,6 @@ class GatherPixelRefDevice : public SkBitmapDevice { } }; -class NoSaveLayerCanvas : public SkCanvas { - public: - NoSaveLayerCanvas(SkBaseDevice* device) : INHERITED(device) {} - - protected: - // Turn saveLayer() into save() for speed, should not affect correctness. - virtual SaveLayerStrategy willSaveLayer(const SkRect* bounds, - const SkPaint* paint, - SaveFlags flags) SK_OVERRIDE { - this->INHERITED::willSaveLayer(bounds, paint, flags); - return kNoLayer_SaveLayerStrategy; - } - - // Disable aa for speed. - virtual void onClipRect(const SkRect& rect, - SkRegion::Op op, - ClipEdgeStyle edge_style) SK_OVERRIDE { - this->INHERITED::onClipRect(rect, op, kHard_ClipEdgeStyle); - } - - virtual void onClipPath(const SkPath& path, - SkRegion::Op op, - ClipEdgeStyle edge_style) SK_OVERRIDE { - this->updateClipConservativelyUsingBounds(path.getBounds(), op, - path.isInverseFillType()); - } - virtual void onClipRRect(const SkRRect& rrect, - SkRegion::Op op, - ClipEdgeStyle edge_style) SK_OVERRIDE { - this->updateClipConservativelyUsingBounds(rrect.getBounds(), op, false); - } - - private: - typedef SkCanvas INHERITED; -}; - } // namespace void PixelRefUtils::GatherDiscardablePixelRefs( @@ -398,7 +374,7 @@ void PixelRefUtils::GatherDiscardablePixelRefs( SkBitmap::kNo_Config, picture->width(), picture->height()); GatherPixelRefDevice device(empty_bitmap, &pixel_ref_set); - NoSaveLayerCanvas canvas(&device); + SkNoSaveLayerCanvas canvas(&device); canvas.clipRect(SkRect::MakeWH(picture->width(), picture->height()), SkRegion::kIntersect_Op, diff --git a/skia/ext/vector_platform_device_emf_win.cc b/skia/ext/vector_platform_device_emf_win.cc index fed54ac6d0..20680a2ff5 100644 --- a/skia/ext/vector_platform_device_emf_win.cc +++ b/skia/ext/vector_platform_device_emf_win.cc @@ -696,12 +696,21 @@ void VectorPlatformDeviceEmf::LoadClipRegion() { LoadClippingRegionToDC(hdc_, clip_region_, t); } +#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG SkBaseDevice* VectorPlatformDeviceEmf::onCreateCompatibleDevice( SkBitmap::Config config, int width, int height, bool isOpaque, Usage /*usage*/) { SkASSERT(config == SkBitmap::kARGB_8888_Config); return VectorPlatformDeviceEmf::CreateDevice(width, height, isOpaque, NULL); } +#endif + +SkBaseDevice* VectorPlatformDeviceEmf::onCreateDevice(const SkImageInfo& info, + Usage /*usage*/) { + SkASSERT(info.colorType() == kPMColor_SkColorType); + return VectorPlatformDeviceEmf::CreateDevice( + info.width(), info.height(), info.isOpaque(), NULL); +} bool VectorPlatformDeviceEmf::CreateBrush(bool use_brush, COLORREF color) { SkASSERT(previous_brush_ == NULL); diff --git a/skia/ext/vector_platform_device_emf_win.h b/skia/ext/vector_platform_device_emf_win.h index 6f50d07bd9..844624fc52 100644 --- a/skia/ext/vector_platform_device_emf_win.h +++ b/skia/ext/vector_platform_device_emf_win.h @@ -79,9 +79,13 @@ class VectorPlatformDeviceEmf : public SkBitmapDevice, public PlatformDevice { void LoadClipRegion(); protected: +#ifdef SK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG virtual SkBaseDevice* onCreateCompatibleDevice(SkBitmap::Config, int width, int height, bool isOpaque, Usage usage) OVERRIDE; +#endif + virtual SkBaseDevice* onCreateDevice(const SkImageInfo& info, + Usage usage) OVERRIDE; private: // Applies the SkPaint's painting properties in the current GDI context, if diff --git a/skia/skia.target.darwin-x86_64.mk b/skia/skia.target.darwin-x86_64.mk new file mode 100644 index 0000000000..96515a86d0 --- /dev/null +++ b/skia/skia.target.darwin-x86_64.mk @@ -0,0 +1,40 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := skia_skia_gyp +LOCAL_MODULE_STEM := skia +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_gyp + +# Alias gyp target name. +.PHONY: skia +skia: skia_skia_gyp + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ diff --git a/skia/skia.target.linux-x86_64.mk b/skia/skia.target.linux-x86_64.mk new file mode 100644 index 0000000000..96515a86d0 --- /dev/null +++ b/skia/skia.target.linux-x86_64.mk @@ -0,0 +1,40 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := GYP +LOCAL_MODULE := skia_skia_gyp +LOCAL_MODULE_STEM := skia +LOCAL_MODULE_SUFFIX := .stamp +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_chrome_gyp)/skia_skia_chrome_gyp.a + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +### Rules for final target. +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_gyp + +# Alias gyp target name. +.PHONY: skia +skia: skia_skia_gyp + +LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp +LOCAL_UNINSTALLABLE_MODULE := true + +include $(BUILD_SYSTEM)/base_rules.mk + +$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES) + $(hide) echo "Gyp timestamp: $@" + $(hide) mkdir -p $(dir $@) + $(hide) touch $@ diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk index 9f47e91b24..012a9946f2 100644 --- a/skia/skia_chrome.target.darwin-arm.mk +++ b/skia/skia_chrome.target.darwin-arm.mk @@ -110,9 +110,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -134,6 +132,7 @@ MY_DEFS_Debug := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -239,9 +238,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -263,6 +260,7 @@ MY_DEFS_Release := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome.target.darwin-mips.mk b/skia/skia_chrome.target.darwin-mips.mk index a7f23143af..0f1b05a0ce 100644 --- a/skia/skia_chrome.target.darwin-mips.mk +++ b/skia/skia_chrome.target.darwin-mips.mk @@ -110,9 +110,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -133,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -238,9 +237,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -261,6 +258,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome.target.darwin-x86.mk b/skia/skia_chrome.target.darwin-x86.mk index 6b439ada46..61cb3b710a 100644 --- a/skia/skia_chrome.target.darwin-x86.mk +++ b/skia/skia_chrome.target.darwin-x86.mk @@ -111,9 +111,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -134,6 +132,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -239,9 +238,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -262,6 +259,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome.target.darwin-x86_64.mk b/skia/skia_chrome.target.darwin-x86_64.mk new file mode 100644 index 0000000000..8e31f79aad --- /dev/null +++ b/skia/skia_chrome.target.darwin-x86_64.mk @@ -0,0 +1,365 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_chrome_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_CPP_EXTENSION := .cc +$(gyp_intermediate_dir)/SkMemory_new_handler.cc: $(LOCAL_PATH)/skia/ext/SkMemory_new_handler.cpp + mkdir -p $(@D); cp $< $@ +LOCAL_GENERATED_SOURCES := \ + $(gyp_intermediate_dir)/SkMemory_new_handler.cc + +GYP_COPIED_SOURCE_ORIGIN_DIRS := \ + $(LOCAL_PATH)/skia/ext + +LOCAL_SRC_FILES := \ + skia/ext/analysis_canvas.cc \ + skia/ext/benchmarking_canvas.cc \ + skia/ext/bitmap_platform_device_skia.cc \ + skia/ext/convolver.cc \ + skia/ext/event_tracer_impl.cc \ + skia/ext/google_logging.cc \ + skia/ext/image_operations.cc \ + skia/ext/lazy_pixel_ref.cc \ + skia/ext/opacity_draw_filter.cc \ + skia/ext/paint_simplifier.cc \ + skia/ext/pixel_ref_utils.cc \ + skia/ext/platform_canvas.cc \ + skia/ext/platform_device.cc \ + skia/ext/platform_device_linux.cc \ + skia/ext/recursive_gaussian_convolution.cc \ + skia/ext/SkDiscardableMemory_chrome.cc \ + skia/ext/skia_utils_base.cc \ + skia/ext/vector_platform_device_skia.cc + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := \ + skia_skia_library_gyp + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_chrome_gyp + +# Alias gyp target name. +.PHONY: skia_chrome +skia_chrome: skia_skia_chrome_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_chrome.target.linux-arm.mk b/skia/skia_chrome.target.linux-arm.mk index 9f47e91b24..012a9946f2 100644 --- a/skia/skia_chrome.target.linux-arm.mk +++ b/skia/skia_chrome.target.linux-arm.mk @@ -110,9 +110,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -134,6 +132,7 @@ MY_DEFS_Debug := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -239,9 +238,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -263,6 +260,7 @@ MY_DEFS_Release := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome.target.linux-mips.mk b/skia/skia_chrome.target.linux-mips.mk index a7f23143af..0f1b05a0ce 100644 --- a/skia/skia_chrome.target.linux-mips.mk +++ b/skia/skia_chrome.target.linux-mips.mk @@ -110,9 +110,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -133,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -238,9 +237,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -261,6 +258,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome.target.linux-x86.mk b/skia/skia_chrome.target.linux-x86.mk index 6b439ada46..61cb3b710a 100644 --- a/skia/skia_chrome.target.linux-x86.mk +++ b/skia/skia_chrome.target.linux-x86.mk @@ -111,9 +111,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -134,6 +132,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -239,9 +238,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -262,6 +259,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome.target.linux-x86_64.mk b/skia/skia_chrome.target.linux-x86_64.mk new file mode 100644 index 0000000000..8e31f79aad --- /dev/null +++ b/skia/skia_chrome.target.linux-x86_64.mk @@ -0,0 +1,365 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_chrome_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,STATIC_LIBRARIES,skia_skia_library_gyp)/skia_skia_library_gyp.a + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_CPP_EXTENSION := .cc +$(gyp_intermediate_dir)/SkMemory_new_handler.cc: $(LOCAL_PATH)/skia/ext/SkMemory_new_handler.cpp + mkdir -p $(@D); cp $< $@ +LOCAL_GENERATED_SOURCES := \ + $(gyp_intermediate_dir)/SkMemory_new_handler.cc + +GYP_COPIED_SOURCE_ORIGIN_DIRS := \ + $(LOCAL_PATH)/skia/ext + +LOCAL_SRC_FILES := \ + skia/ext/analysis_canvas.cc \ + skia/ext/benchmarking_canvas.cc \ + skia/ext/bitmap_platform_device_skia.cc \ + skia/ext/convolver.cc \ + skia/ext/event_tracer_impl.cc \ + skia/ext/google_logging.cc \ + skia/ext/image_operations.cc \ + skia/ext/lazy_pixel_ref.cc \ + skia/ext/opacity_draw_filter.cc \ + skia/ext/paint_simplifier.cc \ + skia/ext/pixel_ref_utils.cc \ + skia/ext/platform_canvas.cc \ + skia/ext/platform_device.cc \ + skia/ext/platform_device_linux.cc \ + skia/ext/recursive_gaussian_convolution.cc \ + skia/ext/SkDiscardableMemory_chrome.cc \ + skia/ext/skia_utils_base.cc \ + skia/ext/vector_platform_device_skia.cc + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := \ + skia_skia_library_gyp + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_chrome_gyp + +# Alias gyp target name. +.PHONY: skia_chrome +skia_chrome: skia_skia_chrome_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_chrome_opts.target.darwin-mips.mk b/skia/skia_chrome_opts.target.darwin-mips.mk index f9bf013098..299450e7bd 100644 --- a/skia/skia_chrome_opts.target.darwin-mips.mk +++ b/skia/skia_chrome_opts.target.darwin-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -170,6 +171,7 @@ MY_DEFS_Release := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome_opts.target.darwin-x86.mk b/skia/skia_chrome_opts.target.darwin-x86.mk index 0c5e7be866..c8d9c0a01c 100644 --- a/skia/skia_chrome_opts.target.darwin-x86.mk +++ b/skia/skia_chrome_opts.target.darwin-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -169,6 +170,7 @@ MY_DEFS_Release := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome_opts.target.darwin-x86_64.mk b/skia/skia_chrome_opts.target.darwin-x86_64.mk new file mode 100644 index 0000000000..850e11ae48 --- /dev/null +++ b/skia/skia_chrome_opts.target.darwin-x86_64.mk @@ -0,0 +1,264 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_chrome_opts_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_CPP_EXTENSION := .cc +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + skia/ext/convolver_SSE2.cc + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_chrome_opts_gyp + +# Alias gyp target name. +.PHONY: skia_chrome_opts +skia_chrome_opts: skia_skia_chrome_opts_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_chrome_opts.target.linux-mips.mk b/skia/skia_chrome_opts.target.linux-mips.mk index f9bf013098..299450e7bd 100644 --- a/skia/skia_chrome_opts.target.linux-mips.mk +++ b/skia/skia_chrome_opts.target.linux-mips.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -170,6 +171,7 @@ MY_DEFS_Release := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome_opts.target.linux-x86.mk b/skia/skia_chrome_opts.target.linux-x86.mk index 0c5e7be866..c8d9c0a01c 100644 --- a/skia/skia_chrome_opts.target.linux-x86.mk +++ b/skia/skia_chrome_opts.target.linux-x86.mk @@ -82,6 +82,7 @@ MY_DEFS_Debug := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -169,6 +170,7 @@ MY_DEFS_Release := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_chrome_opts.target.linux-x86_64.mk b/skia/skia_chrome_opts.target.linux-x86_64.mk new file mode 100644 index 0000000000..850e11ae48 --- /dev/null +++ b/skia/skia_chrome_opts.target.linux-x86_64.mk @@ -0,0 +1,264 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_chrome_opts_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_CPP_EXTENSION := .cc +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + skia/ext/convolver_SSE2.cc + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_chrome_opts_gyp + +# Alias gyp target name. +.PHONY: skia_chrome_opts +skia_chrome_opts: skia_skia_chrome_opts_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi index fa4c9db678..05f1933512 100644 --- a/skia/skia_library.gypi +++ b/skia/skia_library.gypi @@ -42,6 +42,10 @@ '../third_party/skia/src/fonts/SkFontMgr_fontconfig.cpp', '../third_party/skia/src/ports/SkFontHost_fontconfig.cpp', + '../third_party/skia/src/fonts/SkFontMgr_indirect.cpp', + '../third_party/skia/src/fonts/SkRemotableFontMgr.cpp', + '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp', + '../third_party/skia/src/ports/SkFontHost_FreeType.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.cpp', '../third_party/skia/src/ports/SkFontHost_FreeType_common.h', @@ -66,6 +70,7 @@ '../third_party/skia/include/utils/mac/SkCGUtils.h', '../third_party/skia/include/utils/SkDeferredCanvas.h', '../third_party/skia/include/utils/SkMatrix44.h', + '../third_party/skia/include/utils/SkNoSaveLayerCanvas.h', '../third_party/skia/src/utils/debugger/SkDebugCanvas.cpp', '../third_party/skia/src/utils/debugger/SkDebugCanvas.h', '../third_party/skia/src/utils/debugger/SkDrawCommand.cpp', @@ -89,19 +94,26 @@ '../third_party/skia/src/utils/SkProxyCanvas.cpp', '../third_party/skia/src/utils/SkRTConf.cpp', '../third_party/skia/include/utils/SkRTConf.h', + '../third_party/skia/src/utils/win/SkDWrite.h', + '../third_party/skia/src/utils/win/SkDWrite.cpp', '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp', '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h', '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp', '../third_party/skia/src/utils/win/SkDWriteGeometrySink.h', '../third_party/skia/src/utils/win/SkHRESULT.cpp', - '../third_party/skia/include/ports/SkTypeface_win.h', - '../third_party/skia/include/images/SkImageRef.h', '../third_party/skia/include/images/SkImageRef_GlobalPool.h', '../third_party/skia/include/images/SkMovie.h', '../third_party/skia/include/images/SkPageFlipper.h', + '../third_party/skia/include/ports/SkFontConfigInterface.h', + '../third_party/skia/include/ports/SkFontMgr.h', + '../third_party/skia/include/ports/SkFontMgr_indirect.h', + '../third_party/skia/include/ports/SkFontStyle.h', + '../third_party/skia/include/ports/SkRemotableFontMgr.h', + '../third_party/skia/include/ports/SkTypeface_win.h', + '../third_party/skia/include/utils/SkNullCanvas.h', '../third_party/skia/include/utils/SkPictureUtils.h', '../third_party/skia/include/utils/SkProxyCanvas.h', @@ -282,7 +294,10 @@ 'sources!': [ '../third_party/skia/src/ports/SkFontHost_win_dw.cpp', '../third_party/skia/src/ports/SkFontMgr_default_gdi.cpp', + '../third_party/skia/src/ports/SkRemotableFontMgr_win_dw.cpp', + '../third_party/skia/src/utils/win/SkDWrite.h', + '../third_party/skia/src/utils/win/SkDWrite.cpp', '../third_party/skia/src/utils/win/SkDWriteFontFileStream.cpp', '../third_party/skia/src/utils/win/SkDWriteFontFileStream.h', '../third_party/skia/src/utils/win/SkDWriteGeometrySink.cpp', diff --git a/skia/skia_library.target.darwin-arm.mk b/skia/skia_library.target.darwin-arm.mk index 41a8bf2ffe..738b49aaf5 100644 --- a/skia/skia_library.target.darwin-arm.mk +++ b/skia/skia_library.target.darwin-arm.mk @@ -31,6 +31,8 @@ LOCAL_SRC_FILES := \ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ third_party/skia/src/ports/SkFontHost_FreeType.cpp \ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ third_party/skia/src/ports/SkFontConfigParser_android.cpp \ @@ -277,6 +279,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ third_party/skia/src/effects/SkTestImageFilters.cpp \ third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ third_party/skia/src/effects/SkTransparentShader.cpp \ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ @@ -341,6 +344,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrStencil.cpp \ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ third_party/skia/src/gpu/GrSWMaskHelper.cpp \ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ third_party/skia/src/gpu/GrSurface.cpp \ @@ -457,9 +461,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -481,6 +483,7 @@ MY_DEFS_Debug := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -597,9 +600,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -621,6 +622,7 @@ MY_DEFS_Release := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_library.target.darwin-mips.mk b/skia/skia_library.target.darwin-mips.mk index 3ef7430984..e72da4b145 100644 --- a/skia/skia_library.target.darwin-mips.mk +++ b/skia/skia_library.target.darwin-mips.mk @@ -31,6 +31,8 @@ LOCAL_SRC_FILES := \ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ third_party/skia/src/ports/SkFontHost_FreeType.cpp \ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ third_party/skia/src/ports/SkFontConfigParser_android.cpp \ @@ -277,6 +279,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ third_party/skia/src/effects/SkTestImageFilters.cpp \ third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ third_party/skia/src/effects/SkTransparentShader.cpp \ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ @@ -341,6 +344,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrStencil.cpp \ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ third_party/skia/src/gpu/GrSWMaskHelper.cpp \ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ third_party/skia/src/gpu/GrSurface.cpp \ @@ -456,9 +460,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -479,6 +481,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -595,9 +598,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -618,6 +619,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_library.target.darwin-x86.mk b/skia/skia_library.target.darwin-x86.mk index 8b8be1cb13..e8aeef19a6 100644 --- a/skia/skia_library.target.darwin-x86.mk +++ b/skia/skia_library.target.darwin-x86.mk @@ -32,6 +32,8 @@ LOCAL_SRC_FILES := \ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ third_party/skia/src/ports/SkFontHost_FreeType.cpp \ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ third_party/skia/src/ports/SkFontConfigParser_android.cpp \ @@ -278,6 +280,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ third_party/skia/src/effects/SkTestImageFilters.cpp \ third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ third_party/skia/src/effects/SkTransparentShader.cpp \ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ @@ -342,6 +345,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrStencil.cpp \ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ third_party/skia/src/gpu/GrSWMaskHelper.cpp \ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ third_party/skia/src/gpu/GrSurface.cpp \ @@ -458,9 +462,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -481,6 +483,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -597,9 +600,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -620,6 +621,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_library.target.darwin-x86_64.mk b/skia/skia_library.target.darwin-x86_64.mk new file mode 100644 index 0000000000..d4756960c0 --- /dev/null +++ b/skia/skia_library.target.darwin-x86_64.mk @@ -0,0 +1,737 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_library_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + third_party/skia/src/core/SkFlate.cpp \ + third_party/skia/src/core/SkPaintOptionsAndroid.cpp \ + third_party/skia/src/ports/SkImageDecoder_empty.cpp \ + third_party/skia/src/images/SkScaledBitmapSampler.cpp \ + third_party/skia/src/opts/opts_check_SSE2.cpp \ + third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ + third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ + third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ + third_party/skia/src/ports/SkFontHost_FreeType.cpp \ + third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ + third_party/skia/src/ports/SkFontConfigParser_android.cpp \ + third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \ + third_party/skia/src/ports/SkOSFile_posix.cpp \ + third_party/skia/src/ports/SkOSFile_stdio.cpp \ + third_party/skia/src/ports/SkTime_Unix.cpp \ + third_party/skia/src/ports/SkTLS_pthread.cpp \ + third_party/skia/src/sfnt/SkOTTable_name.cpp \ + third_party/skia/src/sfnt/SkOTUtils.cpp \ + third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \ + third_party/skia/src/utils/debugger/SkDrawCommand.cpp \ + third_party/skia/src/utils/debugger/SkObjectParser.cpp \ + third_party/skia/src/utils/SkBase64.cpp \ + third_party/skia/src/utils/SkBitSet.cpp \ + third_party/skia/src/utils/SkCanvasStack.cpp \ + third_party/skia/src/utils/SkCanvasStateUtils.cpp \ + third_party/skia/src/utils/SkEventTracer.cpp \ + third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix44.cpp \ + third_party/skia/src/utils/SkNullCanvas.cpp \ + third_party/skia/src/utils/SkNWayCanvas.cpp \ + third_party/skia/src/utils/SkPictureUtils.cpp \ + third_party/skia/src/utils/SkProxyCanvas.cpp \ + third_party/skia/src/utils/SkRTConf.cpp \ + third_party/skia/src/core/SkAAClip.cpp \ + third_party/skia/src/core/SkAnnotation.cpp \ + third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ + third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBoxRecord.cpp \ + third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ + third_party/skia/src/core/SkBitmap.cpp \ + third_party/skia/src/core/SkBitmapDevice.cpp \ + third_party/skia/src/core/SkBitmapFilter.cpp \ + third_party/skia/src/core/SkBitmapHeap.cpp \ + third_party/skia/src/core/SkBitmapProcShader.cpp \ + third_party/skia/src/core/SkBitmapProcState.cpp \ + third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \ + third_party/skia/src/core/SkBitmapScaler.cpp \ + third_party/skia/src/core/SkBitmap_scroll.cpp \ + third_party/skia/src/core/SkBlitMask_D32.cpp \ + third_party/skia/src/core/SkBlitRow_D16.cpp \ + third_party/skia/src/core/SkBlitRow_D32.cpp \ + third_party/skia/src/core/SkBlitter.cpp \ + third_party/skia/src/core/SkBlitter_A8.cpp \ + third_party/skia/src/core/SkBlitter_ARGB32.cpp \ + third_party/skia/src/core/SkBlitter_RGB16.cpp \ + third_party/skia/src/core/SkBlitter_Sprite.cpp \ + third_party/skia/src/core/SkBuffer.cpp \ + third_party/skia/src/core/SkCanvas.cpp \ + third_party/skia/src/core/SkChunkAlloc.cpp \ + third_party/skia/src/core/SkClipStack.cpp \ + third_party/skia/src/core/SkColor.cpp \ + third_party/skia/src/core/SkColorFilter.cpp \ + third_party/skia/src/core/SkColorTable.cpp \ + third_party/skia/src/core/SkComposeShader.cpp \ + third_party/skia/src/core/SkConfig8888.cpp \ + third_party/skia/src/core/SkConvolver.cpp \ + third_party/skia/src/core/SkCubicClipper.cpp \ + third_party/skia/src/core/SkData.cpp \ + third_party/skia/src/core/SkDataTable.cpp \ + third_party/skia/src/core/SkDebug.cpp \ + third_party/skia/src/core/SkDeque.cpp \ + third_party/skia/src/core/SkDevice.cpp \ + third_party/skia/src/core/SkDeviceLooper.cpp \ + third_party/skia/src/core/SkDeviceProfile.cpp \ + third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \ + third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \ + third_party/skia/src/core/SkDistanceFieldGen.cpp \ + third_party/skia/src/core/SkDither.cpp \ + third_party/skia/src/core/SkDraw.cpp \ + third_party/skia/src/core/SkDrawLooper.cpp \ + third_party/skia/src/core/SkEdgeBuilder.cpp \ + third_party/skia/src/core/SkEdgeClipper.cpp \ + third_party/skia/src/core/SkEdge.cpp \ + third_party/skia/src/core/SkError.cpp \ + third_party/skia/src/core/SkFilterProc.cpp \ + third_party/skia/src/core/SkFilterShader.cpp \ + third_party/skia/src/core/SkFlattenable.cpp \ + third_party/skia/src/core/SkFlattenableSerialization.cpp \ + third_party/skia/src/core/SkFloat.cpp \ + third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFontHost.cpp \ + third_party/skia/src/core/SkFontDescriptor.cpp \ + third_party/skia/src/core/SkFontStream.cpp \ + third_party/skia/src/core/SkGeometry.cpp \ + third_party/skia/src/core/SkGlyphCache.cpp \ + third_party/skia/src/core/SkGraphics.cpp \ + third_party/skia/src/core/SkInstCnt.cpp \ + third_party/skia/src/core/SkImageFilter.cpp \ + third_party/skia/src/core/SkImageInfo.cpp \ + third_party/skia/src/core/SkLineClipper.cpp \ + third_party/skia/src/core/SkMallocPixelRef.cpp \ + third_party/skia/src/core/SkMask.cpp \ + third_party/skia/src/core/SkMaskFilter.cpp \ + third_party/skia/src/core/SkMaskGamma.cpp \ + third_party/skia/src/core/SkMath.cpp \ + third_party/skia/src/core/SkMatrix.cpp \ + third_party/skia/src/core/SkMatrixClipStateMgr.cpp \ + third_party/skia/src/core/SkMetaData.cpp \ + third_party/skia/src/core/SkMipMap.cpp \ + third_party/skia/src/core/SkPackBits.cpp \ + third_party/skia/src/core/SkPaint.cpp \ + third_party/skia/src/core/SkPaintPriv.cpp \ + third_party/skia/src/core/SkPath.cpp \ + third_party/skia/src/core/SkPathEffect.cpp \ + third_party/skia/src/core/SkPathHeap.cpp \ + third_party/skia/src/core/SkPathMeasure.cpp \ + third_party/skia/src/core/SkPathRef.cpp \ + third_party/skia/src/core/SkPicture.cpp \ + third_party/skia/src/core/SkPictureFlat.cpp \ + third_party/skia/src/core/SkPicturePlayback.cpp \ + third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureStateTree.cpp \ + third_party/skia/src/core/SkPixelRef.cpp \ + third_party/skia/src/core/SkPoint.cpp \ + third_party/skia/src/core/SkProcSpriteBlitter.cpp \ + third_party/skia/src/core/SkPtrRecorder.cpp \ + third_party/skia/src/core/SkQuadClipper.cpp \ + third_party/skia/src/core/SkQuadTree.cpp \ + third_party/skia/src/core/SkQuadTreePicture.cpp \ + third_party/skia/src/core/SkRasterClip.cpp \ + third_party/skia/src/core/SkRasterizer.cpp \ + third_party/skia/src/core/SkReadBuffer.cpp \ + third_party/skia/src/core/SkRect.cpp \ + third_party/skia/src/core/SkRefDict.cpp \ + third_party/skia/src/core/SkRegion.cpp \ + third_party/skia/src/core/SkRegion_path.cpp \ + third_party/skia/src/core/SkRRect.cpp \ + third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkScaledImageCache.cpp \ + third_party/skia/src/core/SkScalar.cpp \ + third_party/skia/src/core/SkScalerContext.cpp \ + third_party/skia/src/core/SkScan.cpp \ + third_party/skia/src/core/SkScan_AntiPath.cpp \ + third_party/skia/src/core/SkScan_Antihair.cpp \ + third_party/skia/src/core/SkScan_Hairline.cpp \ + third_party/skia/src/core/SkScan_Path.cpp \ + third_party/skia/src/core/SkShader.cpp \ + third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \ + third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \ + third_party/skia/src/core/SkStream.cpp \ + third_party/skia/src/core/SkString.cpp \ + third_party/skia/src/core/SkStringUtils.cpp \ + third_party/skia/src/core/SkStroke.cpp \ + third_party/skia/src/core/SkStrokeRec.cpp \ + third_party/skia/src/core/SkStrokerPriv.cpp \ + third_party/skia/src/core/SkTileGrid.cpp \ + third_party/skia/src/core/SkTileGridPicture.cpp \ + third_party/skia/src/core/SkTLS.cpp \ + third_party/skia/src/core/SkTSearch.cpp \ + third_party/skia/src/core/SkTypeface.cpp \ + third_party/skia/src/core/SkTypefaceCache.cpp \ + third_party/skia/src/core/SkUnPreMultiply.cpp \ + third_party/skia/src/core/SkUtils.cpp \ + third_party/skia/src/core/SkValidatingReadBuffer.cpp \ + third_party/skia/src/core/SkWriteBuffer.cpp \ + third_party/skia/src/core/SkWriter32.cpp \ + third_party/skia/src/core/SkXfermode.cpp \ + third_party/skia/src/doc/SkDocument.cpp \ + third_party/skia/src/image/SkImage.cpp \ + third_party/skia/src/image/SkImagePriv.cpp \ + third_party/skia/src/image/SkImage_Codec.cpp \ + third_party/skia/src/image/SkImage_Picture.cpp \ + third_party/skia/src/image/SkImage_Raster.cpp \ + third_party/skia/src/image/SkSurface.cpp \ + third_party/skia/src/image/SkSurface_Picture.cpp \ + third_party/skia/src/image/SkSurface_Raster.cpp \ + third_party/skia/src/pipe/SkGPipeRead.cpp \ + third_party/skia/src/pipe/SkGPipeWrite.cpp \ + third_party/skia/src/lazy/SkCachingPixelRef.cpp \ + third_party/skia/src/pathops/SkAddIntersections.cpp \ + third_party/skia/src/pathops/SkDCubicIntersection.cpp \ + third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \ + third_party/skia/src/pathops/SkDCubicToQuads.cpp \ + third_party/skia/src/pathops/SkDLineIntersection.cpp \ + third_party/skia/src/pathops/SkDQuadImplicit.cpp \ + third_party/skia/src/pathops/SkDQuadIntersection.cpp \ + third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \ + third_party/skia/src/pathops/SkIntersections.cpp \ + third_party/skia/src/pathops/SkOpAngle.cpp \ + third_party/skia/src/pathops/SkOpContour.cpp \ + third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \ + third_party/skia/src/pathops/SkOpSegment.cpp \ + third_party/skia/src/pathops/SkPathOpsBounds.cpp \ + third_party/skia/src/pathops/SkPathOpsCommon.cpp \ + third_party/skia/src/pathops/SkPathOpsCubic.cpp \ + third_party/skia/src/pathops/SkPathOpsDebug.cpp \ + third_party/skia/src/pathops/SkPathOpsLine.cpp \ + third_party/skia/src/pathops/SkPathOpsOp.cpp \ + third_party/skia/src/pathops/SkPathOpsPoint.cpp \ + third_party/skia/src/pathops/SkPathOpsQuad.cpp \ + third_party/skia/src/pathops/SkPathOpsRect.cpp \ + third_party/skia/src/pathops/SkPathOpsSimplify.cpp \ + third_party/skia/src/pathops/SkPathOpsTriangle.cpp \ + third_party/skia/src/pathops/SkPathOpsTypes.cpp \ + third_party/skia/src/pathops/SkPathWriter.cpp \ + third_party/skia/src/pathops/SkQuarticRoot.cpp \ + third_party/skia/src/pathops/SkReduceOrder.cpp \ + third_party/skia/src/effects/Sk1DPathEffect.cpp \ + third_party/skia/src/effects/Sk2DPathEffect.cpp \ + third_party/skia/src/effects/SkAlphaThresholdFilter.cpp \ + third_party/skia/src/effects/SkArithmeticMode.cpp \ + third_party/skia/src/effects/SkAvoidXfermode.cpp \ + third_party/skia/src/effects/SkBicubicImageFilter.cpp \ + third_party/skia/src/effects/SkBitmapSource.cpp \ + third_party/skia/src/effects/SkBlurDrawLooper.cpp \ + third_party/skia/src/effects/SkBlurMask.cpp \ + third_party/skia/src/effects/SkBlurImageFilter.cpp \ + third_party/skia/src/effects/SkBlurMaskFilter.cpp \ + third_party/skia/src/effects/SkColorFilters.cpp \ + third_party/skia/src/effects/SkColorFilterImageFilter.cpp \ + third_party/skia/src/effects/SkColorMatrix.cpp \ + third_party/skia/src/effects/SkColorMatrixFilter.cpp \ + third_party/skia/src/effects/SkComposeImageFilter.cpp \ + third_party/skia/src/effects/SkCornerPathEffect.cpp \ + third_party/skia/src/effects/SkDashPathEffect.cpp \ + third_party/skia/src/effects/SkDiscretePathEffect.cpp \ + third_party/skia/src/effects/SkDisplacementMapEffect.cpp \ + third_party/skia/src/effects/SkDropShadowImageFilter.cpp \ + third_party/skia/src/effects/SkEmbossMask.cpp \ + third_party/skia/src/effects/SkEmbossMaskFilter.cpp \ + third_party/skia/src/effects/SkGpuBlurUtils.cpp \ + third_party/skia/src/effects/SkKernel33MaskFilter.cpp \ + third_party/skia/src/effects/SkLayerDrawLooper.cpp \ + third_party/skia/src/effects/SkLayerRasterizer.cpp \ + third_party/skia/src/effects/SkLerpXfermode.cpp \ + third_party/skia/src/effects/SkLightingImageFilter.cpp \ + third_party/skia/src/effects/SkLumaColorFilter.cpp \ + third_party/skia/src/effects/SkMagnifierImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \ + third_party/skia/src/effects/SkMergeImageFilter.cpp \ + third_party/skia/src/effects/SkMorphologyImageFilter.cpp \ + third_party/skia/src/effects/SkOffsetImageFilter.cpp \ + third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \ + third_party/skia/src/effects/SkPerlinNoiseShader.cpp \ + third_party/skia/src/effects/SkPictureImageFilter.cpp \ + third_party/skia/src/effects/SkPixelXorXfermode.cpp \ + third_party/skia/src/effects/SkPorterDuff.cpp \ + third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ + third_party/skia/src/effects/SkResizeImageFilter.cpp \ + third_party/skia/src/effects/SkStippleMaskFilter.cpp \ + third_party/skia/src/effects/SkTableColorFilter.cpp \ + third_party/skia/src/effects/SkTableMaskFilter.cpp \ + third_party/skia/src/effects/SkTestImageFilters.cpp \ + third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ + third_party/skia/src/effects/SkTransparentShader.cpp \ + third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ + third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ + third_party/skia/src/effects/gradients/SkClampRange.cpp \ + third_party/skia/src/effects/gradients/SkGradientShader.cpp \ + third_party/skia/src/effects/gradients/SkLinearGradient.cpp \ + third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ + third_party/skia/src/pdf/SkPDFCatalog.cpp \ + third_party/skia/src/pdf/SkPDFDevice.cpp \ + third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \ + third_party/skia/src/pdf/SkPDFDocument.cpp \ + third_party/skia/src/pdf/SkPDFFont.cpp \ + third_party/skia/src/pdf/SkPDFFormXObject.cpp \ + third_party/skia/src/pdf/SkPDFGraphicState.cpp \ + third_party/skia/src/pdf/SkPDFImage.cpp \ + third_party/skia/src/pdf/SkPDFPage.cpp \ + third_party/skia/src/pdf/SkPDFResourceDict.cpp \ + third_party/skia/src/pdf/SkPDFShader.cpp \ + third_party/skia/src/pdf/SkPDFStream.cpp \ + third_party/skia/src/pdf/SkPDFTypes.cpp \ + third_party/skia/src/pdf/SkPDFUtils.cpp \ + third_party/skia/src/gpu/gl/GrGLCreateNullInterface.cpp \ + third_party/skia/src/gpu/gl/SkNullGLContext.cpp \ + third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \ + third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \ + third_party/skia/src/gpu/GrAARectRenderer.cpp \ + third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \ + third_party/skia/src/gpu/GrAllocPool.cpp \ + third_party/skia/src/gpu/GrAtlas.cpp \ + third_party/skia/src/gpu/GrBitmapTextContext.cpp \ + third_party/skia/src/gpu/GrBlend.cpp \ + third_party/skia/src/gpu/GrBufferAllocPool.cpp \ + third_party/skia/src/gpu/GrCacheID.cpp \ + third_party/skia/src/gpu/GrClipData.cpp \ + third_party/skia/src/gpu/GrContext.cpp \ + third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \ + third_party/skia/src/gpu/GrDistanceFieldTextContext.cpp \ + third_party/skia/src/gpu/GrDrawState.cpp \ + third_party/skia/src/gpu/GrDrawTarget.cpp \ + third_party/skia/src/gpu/GrEffect.cpp \ + third_party/skia/src/gpu/GrClipMaskCache.cpp \ + third_party/skia/src/gpu/GrClipMaskManager.cpp \ + third_party/skia/src/gpu/GrGpu.cpp \ + third_party/skia/src/gpu/GrGpuFactory.cpp \ + third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrMemoryPool.cpp \ + third_party/skia/src/gpu/GrOvalRenderer.cpp \ + third_party/skia/src/gpu/GrPaint.cpp \ + third_party/skia/src/gpu/GrPath.cpp \ + third_party/skia/src/gpu/GrPathRendererChain.cpp \ + third_party/skia/src/gpu/GrPathRenderer.cpp \ + third_party/skia/src/gpu/GrPathUtils.cpp \ + third_party/skia/src/gpu/GrRectanizer.cpp \ + third_party/skia/src/gpu/GrRectanizer_skyline.cpp \ + third_party/skia/src/gpu/GrRenderTarget.cpp \ + third_party/skia/src/gpu/GrReducedClip.cpp \ + third_party/skia/src/gpu/GrResource.cpp \ + third_party/skia/src/gpu/GrResourceCache.cpp \ + third_party/skia/src/gpu/GrStencil.cpp \ + third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ + third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ + third_party/skia/src/gpu/GrSWMaskHelper.cpp \ + third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ + third_party/skia/src/gpu/GrSurface.cpp \ + third_party/skia/src/gpu/GrTextContext.cpp \ + third_party/skia/src/gpu/GrTextStrike.cpp \ + third_party/skia/src/gpu/GrTexture.cpp \ + third_party/skia/src/gpu/GrTextureAccess.cpp \ + third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \ + third_party/skia/src/gpu/effects/GrBezierEffect.cpp \ + third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \ + third_party/skia/src/gpu/effects/GrConvexPolyEffect.cpp \ + third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \ + third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrRRectEffect.cpp \ + third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrTextureDomain.cpp \ + third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \ + third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \ + third_party/skia/src/gpu/gl/GrGLCaps.cpp \ + third_party/skia/src/gpu/gl/GrGLContext.cpp \ + third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \ + third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \ + third_party/skia/src/gpu/gl/GrGLExtensions.cpp \ + third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \ + third_party/skia/src/gpu/gl/GrGLInterface.cpp \ + third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \ + third_party/skia/src/gpu/gl/GrGLPath.cpp \ + third_party/skia/src/gpu/gl/GrGLProgram.cpp \ + third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \ + third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \ + third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \ + third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \ + third_party/skia/src/gpu/gl/GrGLSL.cpp \ + third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \ + third_party/skia/src/gpu/gl/GrGLTexture.cpp \ + third_party/skia/src/gpu/gl/GrGLUtil.cpp \ + third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \ + third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \ + third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \ + third_party/skia/src/gpu/gl/GrGpuGL.cpp \ + third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \ + third_party/skia/src/gpu/SkGpuDevice.cpp \ + third_party/skia/src/gpu/SkGr.cpp \ + third_party/skia/src/gpu/SkGrFontScaler.cpp \ + third_party/skia/src/gpu/SkGrPixelRef.cpp \ + third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \ + third_party/skia/src/image/SkImage_Gpu.cpp \ + third_party/skia/src/image/SkSurface_Gpu.cpp \ + third_party/skia/src/gpu/gl/SkGLContextHelper.cpp + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/images \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH)/third_party/skia/src/image \ + $(LOCAL_PATH)/third_party/skia/src/ports \ + $(LOCAL_PATH)/third_party/skia/src/sfnt \ + $(LOCAL_PATH)/third_party/skia/src/utils \ + $(LOCAL_PATH)/third_party/skia/src/lazy \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/src/gpu \ + $(LOCAL_PATH)/third_party/expat/files/lib \ + $(LOCAL_PATH)/third_party/zlib \ + $(PWD)/external/expat/lib \ + $(LOCAL_PATH)/third_party/freetype/include \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/images \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH)/third_party/skia/src/image \ + $(LOCAL_PATH)/third_party/skia/src/ports \ + $(LOCAL_PATH)/third_party/skia/src/sfnt \ + $(LOCAL_PATH)/third_party/skia/src/utils \ + $(LOCAL_PATH)/third_party/skia/src/lazy \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/src/gpu \ + $(LOCAL_PATH)/third_party/expat/files/lib \ + $(LOCAL_PATH)/third_party/zlib \ + $(PWD)/external/expat/lib \ + $(LOCAL_PATH)/third_party/freetype/include \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_library_gyp + +# Alias gyp target name. +.PHONY: skia_library +skia_library: skia_skia_library_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_library.target.linux-arm.mk b/skia/skia_library.target.linux-arm.mk index 41a8bf2ffe..738b49aaf5 100644 --- a/skia/skia_library.target.linux-arm.mk +++ b/skia/skia_library.target.linux-arm.mk @@ -31,6 +31,8 @@ LOCAL_SRC_FILES := \ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ third_party/skia/src/ports/SkFontHost_FreeType.cpp \ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ third_party/skia/src/ports/SkFontConfigParser_android.cpp \ @@ -277,6 +279,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ third_party/skia/src/effects/SkTestImageFilters.cpp \ third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ third_party/skia/src/effects/SkTransparentShader.cpp \ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ @@ -341,6 +344,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrStencil.cpp \ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ third_party/skia/src/gpu/GrSWMaskHelper.cpp \ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ third_party/skia/src/gpu/GrSurface.cpp \ @@ -457,9 +461,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -481,6 +483,7 @@ MY_DEFS_Debug := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -597,9 +600,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -621,6 +622,7 @@ MY_DEFS_Release := \ '-D__ARM_HAVE_OPTIONAL_NEON_SUPPORT' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_library.target.linux-mips.mk b/skia/skia_library.target.linux-mips.mk index 3ef7430984..e72da4b145 100644 --- a/skia/skia_library.target.linux-mips.mk +++ b/skia/skia_library.target.linux-mips.mk @@ -31,6 +31,8 @@ LOCAL_SRC_FILES := \ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ third_party/skia/src/ports/SkFontHost_FreeType.cpp \ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ third_party/skia/src/ports/SkFontConfigParser_android.cpp \ @@ -277,6 +279,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ third_party/skia/src/effects/SkTestImageFilters.cpp \ third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ third_party/skia/src/effects/SkTransparentShader.cpp \ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ @@ -341,6 +344,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrStencil.cpp \ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ third_party/skia/src/gpu/GrSWMaskHelper.cpp \ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ third_party/skia/src/gpu/GrSurface.cpp \ @@ -456,9 +460,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -479,6 +481,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -595,9 +598,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -618,6 +619,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_library.target.linux-x86.mk b/skia/skia_library.target.linux-x86.mk index 8b8be1cb13..e8aeef19a6 100644 --- a/skia/skia_library.target.linux-x86.mk +++ b/skia/skia_library.target.linux-x86.mk @@ -32,6 +32,8 @@ LOCAL_SRC_FILES := \ third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ third_party/skia/src/ports/SkFontHost_FreeType.cpp \ third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ third_party/skia/src/ports/SkFontConfigParser_android.cpp \ @@ -278,6 +280,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/effects/SkTableMaskFilter.cpp \ third_party/skia/src/effects/SkTestImageFilters.cpp \ third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ third_party/skia/src/effects/SkTransparentShader.cpp \ third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ @@ -342,6 +345,7 @@ LOCAL_SRC_FILES := \ third_party/skia/src/gpu/GrStencil.cpp \ third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ third_party/skia/src/gpu/GrSWMaskHelper.cpp \ third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ third_party/skia/src/gpu/GrSurface.cpp \ @@ -458,9 +462,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -481,6 +483,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -597,9 +600,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -620,6 +621,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk new file mode 100644 index 0000000000..d4756960c0 --- /dev/null +++ b/skia/skia_library.target.linux-x86_64.mk @@ -0,0 +1,737 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_library_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := \ + $(call intermediates-dir-for,GYP,third_party_WebKit_public_blink_skia_config_gyp)/blink_skia_config.stamp \ + $(call intermediates-dir-for,GYP,third_party_expat_expat_gyp)/expat.stamp + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + third_party/skia/src/core/SkFlate.cpp \ + third_party/skia/src/core/SkPaintOptionsAndroid.cpp \ + third_party/skia/src/ports/SkImageDecoder_empty.cpp \ + third_party/skia/src/images/SkScaledBitmapSampler.cpp \ + third_party/skia/src/opts/opts_check_SSE2.cpp \ + third_party/skia/src/ports/SkPurgeableMemoryBlock_none.cpp \ + third_party/skia/src/ports/SkFontConfigInterface_android.cpp \ + third_party/skia/src/ports/SkFontHost_fontconfig.cpp \ + third_party/skia/src/fonts/SkFontMgr_indirect.cpp \ + third_party/skia/src/fonts/SkRemotableFontMgr.cpp \ + third_party/skia/src/ports/SkFontHost_FreeType.cpp \ + third_party/skia/src/ports/SkFontHost_FreeType_common.cpp \ + third_party/skia/src/ports/SkFontConfigParser_android.cpp \ + third_party/skia/src/ports/SkGlobalInitialization_chromium.cpp \ + third_party/skia/src/ports/SkOSFile_posix.cpp \ + third_party/skia/src/ports/SkOSFile_stdio.cpp \ + third_party/skia/src/ports/SkTime_Unix.cpp \ + third_party/skia/src/ports/SkTLS_pthread.cpp \ + third_party/skia/src/sfnt/SkOTTable_name.cpp \ + third_party/skia/src/sfnt/SkOTUtils.cpp \ + third_party/skia/src/utils/debugger/SkDebugCanvas.cpp \ + third_party/skia/src/utils/debugger/SkDrawCommand.cpp \ + third_party/skia/src/utils/debugger/SkObjectParser.cpp \ + third_party/skia/src/utils/SkBase64.cpp \ + third_party/skia/src/utils/SkBitSet.cpp \ + third_party/skia/src/utils/SkCanvasStack.cpp \ + third_party/skia/src/utils/SkCanvasStateUtils.cpp \ + third_party/skia/src/utils/SkEventTracer.cpp \ + third_party/skia/src/utils/SkDeferredCanvas.cpp \ + third_party/skia/src/utils/SkMatrix44.cpp \ + third_party/skia/src/utils/SkNullCanvas.cpp \ + third_party/skia/src/utils/SkNWayCanvas.cpp \ + third_party/skia/src/utils/SkPictureUtils.cpp \ + third_party/skia/src/utils/SkProxyCanvas.cpp \ + third_party/skia/src/utils/SkRTConf.cpp \ + third_party/skia/src/core/SkAAClip.cpp \ + third_party/skia/src/core/SkAnnotation.cpp \ + third_party/skia/src/core/SkAdvancedTypefaceMetrics.cpp \ + third_party/skia/src/core/SkAlphaRuns.cpp \ + third_party/skia/src/core/SkBBoxRecord.cpp \ + third_party/skia/src/core/SkBBoxHierarchyRecord.cpp \ + third_party/skia/src/core/SkBitmap.cpp \ + third_party/skia/src/core/SkBitmapDevice.cpp \ + third_party/skia/src/core/SkBitmapFilter.cpp \ + third_party/skia/src/core/SkBitmapHeap.cpp \ + third_party/skia/src/core/SkBitmapProcShader.cpp \ + third_party/skia/src/core/SkBitmapProcState.cpp \ + third_party/skia/src/core/SkBitmapProcState_matrixProcs.cpp \ + third_party/skia/src/core/SkBitmapScaler.cpp \ + third_party/skia/src/core/SkBitmap_scroll.cpp \ + third_party/skia/src/core/SkBlitMask_D32.cpp \ + third_party/skia/src/core/SkBlitRow_D16.cpp \ + third_party/skia/src/core/SkBlitRow_D32.cpp \ + third_party/skia/src/core/SkBlitter.cpp \ + third_party/skia/src/core/SkBlitter_A8.cpp \ + third_party/skia/src/core/SkBlitter_ARGB32.cpp \ + third_party/skia/src/core/SkBlitter_RGB16.cpp \ + third_party/skia/src/core/SkBlitter_Sprite.cpp \ + third_party/skia/src/core/SkBuffer.cpp \ + third_party/skia/src/core/SkCanvas.cpp \ + third_party/skia/src/core/SkChunkAlloc.cpp \ + third_party/skia/src/core/SkClipStack.cpp \ + third_party/skia/src/core/SkColor.cpp \ + third_party/skia/src/core/SkColorFilter.cpp \ + third_party/skia/src/core/SkColorTable.cpp \ + third_party/skia/src/core/SkComposeShader.cpp \ + third_party/skia/src/core/SkConfig8888.cpp \ + third_party/skia/src/core/SkConvolver.cpp \ + third_party/skia/src/core/SkCubicClipper.cpp \ + third_party/skia/src/core/SkData.cpp \ + third_party/skia/src/core/SkDataTable.cpp \ + third_party/skia/src/core/SkDebug.cpp \ + third_party/skia/src/core/SkDeque.cpp \ + third_party/skia/src/core/SkDevice.cpp \ + third_party/skia/src/core/SkDeviceLooper.cpp \ + third_party/skia/src/core/SkDeviceProfile.cpp \ + third_party/skia/src/lazy/SkDiscardableMemoryPool.cpp \ + third_party/skia/src/lazy/SkDiscardablePixelRef.cpp \ + third_party/skia/src/core/SkDistanceFieldGen.cpp \ + third_party/skia/src/core/SkDither.cpp \ + third_party/skia/src/core/SkDraw.cpp \ + third_party/skia/src/core/SkDrawLooper.cpp \ + third_party/skia/src/core/SkEdgeBuilder.cpp \ + third_party/skia/src/core/SkEdgeClipper.cpp \ + third_party/skia/src/core/SkEdge.cpp \ + third_party/skia/src/core/SkError.cpp \ + third_party/skia/src/core/SkFilterProc.cpp \ + third_party/skia/src/core/SkFilterShader.cpp \ + third_party/skia/src/core/SkFlattenable.cpp \ + third_party/skia/src/core/SkFlattenableSerialization.cpp \ + third_party/skia/src/core/SkFloat.cpp \ + third_party/skia/src/core/SkFloatBits.cpp \ + third_party/skia/src/core/SkFontHost.cpp \ + third_party/skia/src/core/SkFontDescriptor.cpp \ + third_party/skia/src/core/SkFontStream.cpp \ + third_party/skia/src/core/SkGeometry.cpp \ + third_party/skia/src/core/SkGlyphCache.cpp \ + third_party/skia/src/core/SkGraphics.cpp \ + third_party/skia/src/core/SkInstCnt.cpp \ + third_party/skia/src/core/SkImageFilter.cpp \ + third_party/skia/src/core/SkImageInfo.cpp \ + third_party/skia/src/core/SkLineClipper.cpp \ + third_party/skia/src/core/SkMallocPixelRef.cpp \ + third_party/skia/src/core/SkMask.cpp \ + third_party/skia/src/core/SkMaskFilter.cpp \ + third_party/skia/src/core/SkMaskGamma.cpp \ + third_party/skia/src/core/SkMath.cpp \ + third_party/skia/src/core/SkMatrix.cpp \ + third_party/skia/src/core/SkMatrixClipStateMgr.cpp \ + third_party/skia/src/core/SkMetaData.cpp \ + third_party/skia/src/core/SkMipMap.cpp \ + third_party/skia/src/core/SkPackBits.cpp \ + third_party/skia/src/core/SkPaint.cpp \ + third_party/skia/src/core/SkPaintPriv.cpp \ + third_party/skia/src/core/SkPath.cpp \ + third_party/skia/src/core/SkPathEffect.cpp \ + third_party/skia/src/core/SkPathHeap.cpp \ + third_party/skia/src/core/SkPathMeasure.cpp \ + third_party/skia/src/core/SkPathRef.cpp \ + third_party/skia/src/core/SkPicture.cpp \ + third_party/skia/src/core/SkPictureFlat.cpp \ + third_party/skia/src/core/SkPicturePlayback.cpp \ + third_party/skia/src/core/SkPictureRecord.cpp \ + third_party/skia/src/core/SkPictureStateTree.cpp \ + third_party/skia/src/core/SkPixelRef.cpp \ + third_party/skia/src/core/SkPoint.cpp \ + third_party/skia/src/core/SkProcSpriteBlitter.cpp \ + third_party/skia/src/core/SkPtrRecorder.cpp \ + third_party/skia/src/core/SkQuadClipper.cpp \ + third_party/skia/src/core/SkQuadTree.cpp \ + third_party/skia/src/core/SkQuadTreePicture.cpp \ + third_party/skia/src/core/SkRasterClip.cpp \ + third_party/skia/src/core/SkRasterizer.cpp \ + third_party/skia/src/core/SkReadBuffer.cpp \ + third_party/skia/src/core/SkRect.cpp \ + third_party/skia/src/core/SkRefDict.cpp \ + third_party/skia/src/core/SkRegion.cpp \ + third_party/skia/src/core/SkRegion_path.cpp \ + third_party/skia/src/core/SkRRect.cpp \ + third_party/skia/src/core/SkRTree.cpp \ + third_party/skia/src/core/SkScaledImageCache.cpp \ + third_party/skia/src/core/SkScalar.cpp \ + third_party/skia/src/core/SkScalerContext.cpp \ + third_party/skia/src/core/SkScan.cpp \ + third_party/skia/src/core/SkScan_AntiPath.cpp \ + third_party/skia/src/core/SkScan_Antihair.cpp \ + third_party/skia/src/core/SkScan_Hairline.cpp \ + third_party/skia/src/core/SkScan_Path.cpp \ + third_party/skia/src/core/SkShader.cpp \ + third_party/skia/src/core/SkSpriteBlitter_ARGB32.cpp \ + third_party/skia/src/core/SkSpriteBlitter_RGB16.cpp \ + third_party/skia/src/core/SkStream.cpp \ + third_party/skia/src/core/SkString.cpp \ + third_party/skia/src/core/SkStringUtils.cpp \ + third_party/skia/src/core/SkStroke.cpp \ + third_party/skia/src/core/SkStrokeRec.cpp \ + third_party/skia/src/core/SkStrokerPriv.cpp \ + third_party/skia/src/core/SkTileGrid.cpp \ + third_party/skia/src/core/SkTileGridPicture.cpp \ + third_party/skia/src/core/SkTLS.cpp \ + third_party/skia/src/core/SkTSearch.cpp \ + third_party/skia/src/core/SkTypeface.cpp \ + third_party/skia/src/core/SkTypefaceCache.cpp \ + third_party/skia/src/core/SkUnPreMultiply.cpp \ + third_party/skia/src/core/SkUtils.cpp \ + third_party/skia/src/core/SkValidatingReadBuffer.cpp \ + third_party/skia/src/core/SkWriteBuffer.cpp \ + third_party/skia/src/core/SkWriter32.cpp \ + third_party/skia/src/core/SkXfermode.cpp \ + third_party/skia/src/doc/SkDocument.cpp \ + third_party/skia/src/image/SkImage.cpp \ + third_party/skia/src/image/SkImagePriv.cpp \ + third_party/skia/src/image/SkImage_Codec.cpp \ + third_party/skia/src/image/SkImage_Picture.cpp \ + third_party/skia/src/image/SkImage_Raster.cpp \ + third_party/skia/src/image/SkSurface.cpp \ + third_party/skia/src/image/SkSurface_Picture.cpp \ + third_party/skia/src/image/SkSurface_Raster.cpp \ + third_party/skia/src/pipe/SkGPipeRead.cpp \ + third_party/skia/src/pipe/SkGPipeWrite.cpp \ + third_party/skia/src/lazy/SkCachingPixelRef.cpp \ + third_party/skia/src/pathops/SkAddIntersections.cpp \ + third_party/skia/src/pathops/SkDCubicIntersection.cpp \ + third_party/skia/src/pathops/SkDCubicLineIntersection.cpp \ + third_party/skia/src/pathops/SkDCubicToQuads.cpp \ + third_party/skia/src/pathops/SkDLineIntersection.cpp \ + third_party/skia/src/pathops/SkDQuadImplicit.cpp \ + third_party/skia/src/pathops/SkDQuadIntersection.cpp \ + third_party/skia/src/pathops/SkDQuadLineIntersection.cpp \ + third_party/skia/src/pathops/SkIntersections.cpp \ + third_party/skia/src/pathops/SkOpAngle.cpp \ + third_party/skia/src/pathops/SkOpContour.cpp \ + third_party/skia/src/pathops/SkOpEdgeBuilder.cpp \ + third_party/skia/src/pathops/SkOpSegment.cpp \ + third_party/skia/src/pathops/SkPathOpsBounds.cpp \ + third_party/skia/src/pathops/SkPathOpsCommon.cpp \ + third_party/skia/src/pathops/SkPathOpsCubic.cpp \ + third_party/skia/src/pathops/SkPathOpsDebug.cpp \ + third_party/skia/src/pathops/SkPathOpsLine.cpp \ + third_party/skia/src/pathops/SkPathOpsOp.cpp \ + third_party/skia/src/pathops/SkPathOpsPoint.cpp \ + third_party/skia/src/pathops/SkPathOpsQuad.cpp \ + third_party/skia/src/pathops/SkPathOpsRect.cpp \ + third_party/skia/src/pathops/SkPathOpsSimplify.cpp \ + third_party/skia/src/pathops/SkPathOpsTriangle.cpp \ + third_party/skia/src/pathops/SkPathOpsTypes.cpp \ + third_party/skia/src/pathops/SkPathWriter.cpp \ + third_party/skia/src/pathops/SkQuarticRoot.cpp \ + third_party/skia/src/pathops/SkReduceOrder.cpp \ + third_party/skia/src/effects/Sk1DPathEffect.cpp \ + third_party/skia/src/effects/Sk2DPathEffect.cpp \ + third_party/skia/src/effects/SkAlphaThresholdFilter.cpp \ + third_party/skia/src/effects/SkArithmeticMode.cpp \ + third_party/skia/src/effects/SkAvoidXfermode.cpp \ + third_party/skia/src/effects/SkBicubicImageFilter.cpp \ + third_party/skia/src/effects/SkBitmapSource.cpp \ + third_party/skia/src/effects/SkBlurDrawLooper.cpp \ + third_party/skia/src/effects/SkBlurMask.cpp \ + third_party/skia/src/effects/SkBlurImageFilter.cpp \ + third_party/skia/src/effects/SkBlurMaskFilter.cpp \ + third_party/skia/src/effects/SkColorFilters.cpp \ + third_party/skia/src/effects/SkColorFilterImageFilter.cpp \ + third_party/skia/src/effects/SkColorMatrix.cpp \ + third_party/skia/src/effects/SkColorMatrixFilter.cpp \ + third_party/skia/src/effects/SkComposeImageFilter.cpp \ + third_party/skia/src/effects/SkCornerPathEffect.cpp \ + third_party/skia/src/effects/SkDashPathEffect.cpp \ + third_party/skia/src/effects/SkDiscretePathEffect.cpp \ + third_party/skia/src/effects/SkDisplacementMapEffect.cpp \ + third_party/skia/src/effects/SkDropShadowImageFilter.cpp \ + third_party/skia/src/effects/SkEmbossMask.cpp \ + third_party/skia/src/effects/SkEmbossMaskFilter.cpp \ + third_party/skia/src/effects/SkGpuBlurUtils.cpp \ + third_party/skia/src/effects/SkKernel33MaskFilter.cpp \ + third_party/skia/src/effects/SkLayerDrawLooper.cpp \ + third_party/skia/src/effects/SkLayerRasterizer.cpp \ + third_party/skia/src/effects/SkLerpXfermode.cpp \ + third_party/skia/src/effects/SkLightingImageFilter.cpp \ + third_party/skia/src/effects/SkLumaColorFilter.cpp \ + third_party/skia/src/effects/SkMagnifierImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixConvolutionImageFilter.cpp \ + third_party/skia/src/effects/SkMergeImageFilter.cpp \ + third_party/skia/src/effects/SkMorphologyImageFilter.cpp \ + third_party/skia/src/effects/SkOffsetImageFilter.cpp \ + third_party/skia/src/effects/SkPaintFlagsDrawFilter.cpp \ + third_party/skia/src/effects/SkPerlinNoiseShader.cpp \ + third_party/skia/src/effects/SkPictureImageFilter.cpp \ + third_party/skia/src/effects/SkPixelXorXfermode.cpp \ + third_party/skia/src/effects/SkPorterDuff.cpp \ + third_party/skia/src/effects/SkRectShaderImageFilter.cpp \ + third_party/skia/src/effects/SkResizeImageFilter.cpp \ + third_party/skia/src/effects/SkStippleMaskFilter.cpp \ + third_party/skia/src/effects/SkTableColorFilter.cpp \ + third_party/skia/src/effects/SkTableMaskFilter.cpp \ + third_party/skia/src/effects/SkTestImageFilters.cpp \ + third_party/skia/src/effects/SkTileImageFilter.cpp \ + third_party/skia/src/effects/SkMatrixImageFilter.cpp \ + third_party/skia/src/effects/SkTransparentShader.cpp \ + third_party/skia/src/effects/SkXfermodeImageFilter.cpp \ + third_party/skia/src/effects/gradients/SkBitmapCache.cpp \ + third_party/skia/src/effects/gradients/SkClampRange.cpp \ + third_party/skia/src/effects/gradients/SkGradientShader.cpp \ + third_party/skia/src/effects/gradients/SkLinearGradient.cpp \ + third_party/skia/src/effects/gradients/SkRadialGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointRadialGradient.cpp \ + third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.cpp \ + third_party/skia/src/effects/gradients/SkSweepGradient.cpp \ + third_party/skia/src/pdf/SkPDFCatalog.cpp \ + third_party/skia/src/pdf/SkPDFDevice.cpp \ + third_party/skia/src/pdf/SkPDFDeviceFlattener.cpp \ + third_party/skia/src/pdf/SkPDFDocument.cpp \ + third_party/skia/src/pdf/SkPDFFont.cpp \ + third_party/skia/src/pdf/SkPDFFormXObject.cpp \ + third_party/skia/src/pdf/SkPDFGraphicState.cpp \ + third_party/skia/src/pdf/SkPDFImage.cpp \ + third_party/skia/src/pdf/SkPDFPage.cpp \ + third_party/skia/src/pdf/SkPDFResourceDict.cpp \ + third_party/skia/src/pdf/SkPDFShader.cpp \ + third_party/skia/src/pdf/SkPDFStream.cpp \ + third_party/skia/src/pdf/SkPDFTypes.cpp \ + third_party/skia/src/pdf/SkPDFUtils.cpp \ + third_party/skia/src/gpu/gl/GrGLCreateNullInterface.cpp \ + third_party/skia/src/gpu/gl/SkNullGLContext.cpp \ + third_party/skia/src/gpu/GrAAHairLinePathRenderer.cpp \ + third_party/skia/src/gpu/GrAAConvexPathRenderer.cpp \ + third_party/skia/src/gpu/GrAARectRenderer.cpp \ + third_party/skia/src/gpu/GrAddPathRenderers_default.cpp \ + third_party/skia/src/gpu/GrAllocPool.cpp \ + third_party/skia/src/gpu/GrAtlas.cpp \ + third_party/skia/src/gpu/GrBitmapTextContext.cpp \ + third_party/skia/src/gpu/GrBlend.cpp \ + third_party/skia/src/gpu/GrBufferAllocPool.cpp \ + third_party/skia/src/gpu/GrCacheID.cpp \ + third_party/skia/src/gpu/GrClipData.cpp \ + third_party/skia/src/gpu/GrContext.cpp \ + third_party/skia/src/gpu/GrDefaultPathRenderer.cpp \ + third_party/skia/src/gpu/GrDistanceFieldTextContext.cpp \ + third_party/skia/src/gpu/GrDrawState.cpp \ + third_party/skia/src/gpu/GrDrawTarget.cpp \ + third_party/skia/src/gpu/GrEffect.cpp \ + third_party/skia/src/gpu/GrClipMaskCache.cpp \ + third_party/skia/src/gpu/GrClipMaskManager.cpp \ + third_party/skia/src/gpu/GrGpu.cpp \ + third_party/skia/src/gpu/GrGpuFactory.cpp \ + third_party/skia/src/gpu/GrInOrderDrawBuffer.cpp \ + third_party/skia/src/gpu/GrMemoryPool.cpp \ + third_party/skia/src/gpu/GrOvalRenderer.cpp \ + third_party/skia/src/gpu/GrPaint.cpp \ + third_party/skia/src/gpu/GrPath.cpp \ + third_party/skia/src/gpu/GrPathRendererChain.cpp \ + third_party/skia/src/gpu/GrPathRenderer.cpp \ + third_party/skia/src/gpu/GrPathUtils.cpp \ + third_party/skia/src/gpu/GrRectanizer.cpp \ + third_party/skia/src/gpu/GrRectanizer_skyline.cpp \ + third_party/skia/src/gpu/GrRenderTarget.cpp \ + third_party/skia/src/gpu/GrReducedClip.cpp \ + third_party/skia/src/gpu/GrResource.cpp \ + third_party/skia/src/gpu/GrResourceCache.cpp \ + third_party/skia/src/gpu/GrStencil.cpp \ + third_party/skia/src/gpu/GrStencilAndCoverPathRenderer.cpp \ + third_party/skia/src/gpu/GrStencilBuffer.cpp \ + third_party/skia/src/gpu/GrTraceMarker.cpp \ + third_party/skia/src/gpu/GrSWMaskHelper.cpp \ + third_party/skia/src/gpu/GrSoftwarePathRenderer.cpp \ + third_party/skia/src/gpu/GrSurface.cpp \ + third_party/skia/src/gpu/GrTextContext.cpp \ + third_party/skia/src/gpu/GrTextStrike.cpp \ + third_party/skia/src/gpu/GrTexture.cpp \ + third_party/skia/src/gpu/GrTextureAccess.cpp \ + third_party/skia/src/gpu/effects/GrConfigConversionEffect.cpp \ + third_party/skia/src/gpu/effects/GrBezierEffect.cpp \ + third_party/skia/src/gpu/effects/GrConvolutionEffect.cpp \ + third_party/skia/src/gpu/effects/GrConvexPolyEffect.cpp \ + third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \ + third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrRRectEffect.cpp \ + third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \ + third_party/skia/src/gpu/effects/GrTextureDomain.cpp \ + third_party/skia/src/gpu/effects/GrTextureStripAtlas.cpp \ + third_party/skia/src/gpu/gl/GrGLBufferImpl.cpp \ + third_party/skia/src/gpu/gl/GrGLCaps.cpp \ + third_party/skia/src/gpu/gl/GrGLContext.cpp \ + third_party/skia/src/gpu/gl/GrGLCreateNativeInterface_none.cpp \ + third_party/skia/src/gpu/gl/GrGLDefaultInterface_none.cpp \ + third_party/skia/src/gpu/gl/GrGLExtensions.cpp \ + third_party/skia/src/gpu/gl/GrGLIndexBuffer.cpp \ + third_party/skia/src/gpu/gl/GrGLInterface.cpp \ + third_party/skia/src/gpu/gl/GrGLNoOpInterface.cpp \ + third_party/skia/src/gpu/gl/GrGLPath.cpp \ + third_party/skia/src/gpu/gl/GrGLProgram.cpp \ + third_party/skia/src/gpu/gl/GrGLProgramDesc.cpp \ + third_party/skia/src/gpu/gl/GrGLProgramEffects.cpp \ + third_party/skia/src/gpu/gl/GrGLRenderTarget.cpp \ + third_party/skia/src/gpu/gl/GrGLShaderBuilder.cpp \ + third_party/skia/src/gpu/gl/GrGLSL.cpp \ + third_party/skia/src/gpu/gl/GrGLStencilBuffer.cpp \ + third_party/skia/src/gpu/gl/GrGLTexture.cpp \ + third_party/skia/src/gpu/gl/GrGLUtil.cpp \ + third_party/skia/src/gpu/gl/GrGLUniformManager.cpp \ + third_party/skia/src/gpu/gl/GrGLVertexArray.cpp \ + third_party/skia/src/gpu/gl/GrGLVertexBuffer.cpp \ + third_party/skia/src/gpu/gl/GrGpuGL.cpp \ + third_party/skia/src/gpu/gl/GrGpuGL_program.cpp \ + third_party/skia/src/gpu/SkGpuDevice.cpp \ + third_party/skia/src/gpu/SkGr.cpp \ + third_party/skia/src/gpu/SkGrFontScaler.cpp \ + third_party/skia/src/gpu/SkGrPixelRef.cpp \ + third_party/skia/src/gpu/SkGrTexturePixelRef.cpp \ + third_party/skia/src/image/SkImage_Gpu.cpp \ + third_party/skia/src/image/SkSurface_Gpu.cpp \ + third_party/skia/src/gpu/gl/SkGLContextHelper.cpp + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/images \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH)/third_party/skia/src/image \ + $(LOCAL_PATH)/third_party/skia/src/ports \ + $(LOCAL_PATH)/third_party/skia/src/sfnt \ + $(LOCAL_PATH)/third_party/skia/src/utils \ + $(LOCAL_PATH)/third_party/skia/src/lazy \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/src/gpu \ + $(LOCAL_PATH)/third_party/expat/files/lib \ + $(LOCAL_PATH)/third_party/zlib \ + $(PWD)/external/expat/lib \ + $(LOCAL_PATH)/third_party/freetype/include \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/include/images \ + $(LOCAL_PATH)/third_party/skia/include/lazy \ + $(LOCAL_PATH)/third_party/skia/include/pathops \ + $(LOCAL_PATH)/third_party/skia/include/pdf \ + $(LOCAL_PATH)/third_party/skia/include/pipe \ + $(LOCAL_PATH)/third_party/skia/include/ports \ + $(LOCAL_PATH)/third_party/skia/include/utils \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH)/third_party/skia/src/image \ + $(LOCAL_PATH)/third_party/skia/src/ports \ + $(LOCAL_PATH)/third_party/skia/src/sfnt \ + $(LOCAL_PATH)/third_party/skia/src/utils \ + $(LOCAL_PATH)/third_party/skia/src/lazy \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(LOCAL_PATH)/third_party/skia/include/gpu \ + $(LOCAL_PATH)/third_party/skia/src/gpu \ + $(LOCAL_PATH)/third_party/expat/files/lib \ + $(LOCAL_PATH)/third_party/zlib \ + $(PWD)/external/expat/lib \ + $(LOCAL_PATH)/third_party/freetype/include \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_library_gyp + +# Alias gyp target name. +.PHONY: skia_library +skia_library: skia_skia_library_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_library_opts.gyp b/skia/skia_library_opts.gyp index f463c76754..f719075814 100644 --- a/skia/skia_library_opts.gyp +++ b/skia/skia_library_opts.gyp @@ -142,6 +142,18 @@ '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp', ], }], + [ 'target_arch == "arm64"',{ + # TODO(rmcilroy): Update this once http://crrev.com/143423004/ lands. + 'sources': [ + '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp', + '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp', + '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp', + '../third_party/skia/src/opts/SkUtils_opts_none.cpp', + '../third_party/skia/src/opts/SkXfermode_opts_none.cpp', + '../third_party/skia/src/opts/SkMorphology_opts_none.cpp', + '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp', + ], + }], ], }, # For the same lame reasons as what is done for skia_opts, we have to diff --git a/skia/skia_opts.target.darwin-arm.mk b/skia/skia_opts.target.darwin-arm.mk index f4dd864bbb..9b962d6ccc 100644 --- a/skia/skia_opts.target.darwin-arm.mk +++ b/skia/skia_opts.target.darwin-arm.mk @@ -96,9 +96,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -119,6 +117,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -218,9 +217,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -241,6 +238,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts.target.darwin-mips.mk b/skia/skia_opts.target.darwin-mips.mk index de2454d7d4..2512ddd3b8 100644 --- a/skia/skia_opts.target.darwin-mips.mk +++ b/skia/skia_opts.target.darwin-mips.mk @@ -94,9 +94,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -116,6 +114,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -214,9 +213,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -236,6 +233,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts.target.darwin-x86.mk b/skia/skia_opts.target.darwin-x86.mk index b8d4568c23..09094ac01d 100644 --- a/skia/skia_opts.target.darwin-x86.mk +++ b/skia/skia_opts.target.darwin-x86.mk @@ -95,9 +95,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -117,6 +115,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -214,9 +213,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -236,6 +233,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts.target.darwin-x86_64.mk b/skia/skia_opts.target.darwin-x86_64.mk new file mode 100644 index 0000000000..87bd859169 --- /dev/null +++ b/skia/skia_opts.target.darwin-x86_64.mk @@ -0,0 +1,330 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_opts_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp \ + third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp \ + third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp \ + third_party/skia/src/opts/SkUtils_opts_SSE2.cpp \ + third_party/skia/src/opts/SkXfermode_opts_none.cpp \ + third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp \ + third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp \ + third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_opts_gyp + +# Alias gyp target name. +.PHONY: skia_opts +skia_opts: skia_skia_opts_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_opts.target.linux-arm.mk b/skia/skia_opts.target.linux-arm.mk index f4dd864bbb..9b962d6ccc 100644 --- a/skia/skia_opts.target.linux-arm.mk +++ b/skia/skia_opts.target.linux-arm.mk @@ -96,9 +96,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -119,6 +117,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -218,9 +217,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -241,6 +238,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts.target.linux-mips.mk b/skia/skia_opts.target.linux-mips.mk index de2454d7d4..2512ddd3b8 100644 --- a/skia/skia_opts.target.linux-mips.mk +++ b/skia/skia_opts.target.linux-mips.mk @@ -94,9 +94,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -116,6 +114,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -214,9 +213,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -236,6 +233,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts.target.linux-x86.mk b/skia/skia_opts.target.linux-x86.mk index b8d4568c23..09094ac01d 100644 --- a/skia/skia_opts.target.linux-x86.mk +++ b/skia/skia_opts.target.linux-x86.mk @@ -95,9 +95,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -117,6 +115,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -214,9 +213,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -236,6 +233,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts.target.linux-x86_64.mk b/skia/skia_opts.target.linux-x86_64.mk new file mode 100644 index 0000000000..87bd859169 --- /dev/null +++ b/skia/skia_opts.target.linux-x86_64.mk @@ -0,0 +1,330 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_opts_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + third_party/skia/src/opts/SkBitmapProcState_opts_SSE2.cpp \ + third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp \ + third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp \ + third_party/skia/src/opts/SkUtils_opts_SSE2.cpp \ + third_party/skia/src/opts/SkXfermode_opts_none.cpp \ + third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp \ + third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp \ + third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH)/third_party/skia/src/opts \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_opts_gyp + +# Alias gyp target name. +.PHONY: skia_opts +skia_opts: skia_skia_opts_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk index dceddb5f98..028cabaa77 100644 --- a/skia/skia_opts_neon.target.darwin-arm.mk +++ b/skia/skia_opts_neon.target.darwin-arm.mk @@ -97,9 +97,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -120,6 +118,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -219,9 +218,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -242,6 +239,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts_neon.target.linux-arm.mk b/skia/skia_opts_neon.target.linux-arm.mk index dceddb5f98..028cabaa77 100644 --- a/skia/skia_opts_neon.target.linux-arm.mk +++ b/skia/skia_opts_neon.target.linux-arm.mk @@ -97,9 +97,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -120,6 +118,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -219,9 +218,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -242,6 +239,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts_ssse3.target.darwin-x86.mk b/skia/skia_opts_ssse3.target.darwin-x86.mk index 6f02abd82e..7c08f62b7a 100644 --- a/skia/skia_opts_ssse3.target.darwin-x86.mk +++ b/skia/skia_opts_ssse3.target.darwin-x86.mk @@ -89,9 +89,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -111,6 +109,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -208,9 +207,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -230,6 +227,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts_ssse3.target.darwin-x86_64.mk b/skia/skia_opts_ssse3.target.darwin-x86_64.mk new file mode 100644 index 0000000000..d1c49a1ce9 --- /dev/null +++ b/skia/skia_opts_ssse3.target.darwin-x86_64.mk @@ -0,0 +1,323 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_opts_ssse3_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -mssse3 \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -mssse3 \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_opts_ssse3_gyp + +# Alias gyp target name. +.PHONY: skia_opts_ssse3 +skia_opts_ssse3: skia_skia_opts_ssse3_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_opts_ssse3.target.linux-x86.mk b/skia/skia_opts_ssse3.target.linux-x86.mk index 6f02abd82e..7c08f62b7a 100644 --- a/skia/skia_opts_ssse3.target.linux-x86.mk +++ b/skia/skia_opts_ssse3.target.linux-x86.mk @@ -89,9 +89,7 @@ MY_DEFS_Debug := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -111,6 +109,7 @@ MY_DEFS_Debug := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ @@ -208,9 +207,7 @@ MY_DEFS_Release := \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ - '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ - '-DSK_SUPPORT_LEGACY_READPIXELSCONFIG' \ '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ @@ -230,6 +227,7 @@ MY_DEFS_Release := \ '-DSK_GAMMA_CONTRAST=0.0' \ '-DSK_USE_POSIX_THREADS' \ '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ '-D__GNU_SOURCE=1' \ '-DUSE_STLPORT=1' \ diff --git a/skia/skia_opts_ssse3.target.linux-x86_64.mk b/skia/skia_opts_ssse3.target.linux-x86_64.mk new file mode 100644 index 0000000000..d1c49a1ce9 --- /dev/null +++ b/skia/skia_opts_ssse3.target.linux-x86_64.mk @@ -0,0 +1,323 @@ +# This file is generated by gyp; do not edit. + +include $(CLEAR_VARS) + +LOCAL_MODULE_CLASS := STATIC_LIBRARIES +LOCAL_MODULE := skia_skia_opts_ssse3_gyp +LOCAL_MODULE_SUFFIX := .a +LOCAL_MODULE_TAGS := optional +gyp_intermediate_dir := $(call local-intermediates-dir) +gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) + +# Make sure our deps are built first. +GYP_TARGET_DEPENDENCIES := + +GYP_GENERATED_OUTPUTS := + +# Make sure our deps and generated files are built first. +LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS) + +LOCAL_GENERATED_SOURCES := + +GYP_COPIED_SOURCE_ORIGIN_DIRS := + +LOCAL_SRC_FILES := \ + third_party/skia/src/opts/SkBitmapProcState_opts_SSSE3.cpp + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Debug := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -mssse3 \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -g \ + -fomit-frame-pointer \ + -fdata-sections \ + -ffunction-sections \ + -funwind-tables + +MY_DEFS_Debug := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=1' \ + '-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \ + '-D_DEBUG' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Debug := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Debug := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +# Flags passed to both C and C++ files. +MY_CFLAGS_Release := \ + -fstack-protector \ + --param=ssp-buffer-size=4 \ + -fno-exceptions \ + -fno-strict-aliasing \ + -Wno-unused-parameter \ + -Wno-missing-field-initializers \ + -fvisibility=hidden \ + -pipe \ + -fPIC \ + -Wno-unused-local-typedefs \ + -mssse3 \ + -Wno-format \ + -m64 \ + -march=x86-64 \ + -fuse-ld=gold \ + -ffunction-sections \ + -funwind-tables \ + -g \ + -fstack-protector \ + -fno-short-enums \ + -finline-limit=64 \ + -Wa,--noexecstack \ + -U_FORTIFY_SOURCE \ + -Wno-extra \ + -Wno-ignored-qualifiers \ + -Wno-type-limits \ + -Wno-unused-but-set-variable \ + -Wno-address \ + -Wno-format-security \ + -Wno-return-type \ + -Wno-sequence-point \ + -Os \ + -fno-ident \ + -fdata-sections \ + -ffunction-sections \ + -fomit-frame-pointer \ + -funwind-tables + +MY_DEFS_Release := \ + '-DV8_DEPRECATION_WARNINGS' \ + '-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \ + '-D_FILE_OFFSET_BITS=64' \ + '-DNO_TCMALLOC' \ + '-DDISABLE_NACL' \ + '-DCHROMIUM_BUILD' \ + '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_CONFIGURATION_POLICY' \ + '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ + '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ + '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ + '-DENABLE_PRINTING=1' \ + '-DENABLE_MANAGED_USERS=1' \ + '-DSK_ENABLE_INST_COUNT=0' \ + '-DSK_SUPPORT_GPU=1' \ + '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ + '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ + '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ + '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_LAYERRASTERIZER_API=1' \ + '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ + '-DSK_SUPPORT_LEGACY_GETCLIPTYPE' \ + '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ + '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ + '-DSK_BUILD_FOR_ANDROID' \ + '-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \ + '-DSK_DISABLE_OFFSETIMAGEFILTER_OPTIMIZATION' \ + '-DSK_DISABLE_PIXELREF_LOCKCOUNT_BALANCE_CHECK' \ + '-DIGNORE_ROT_AA_RECT_OPT' \ + '-DSK_IGNORE_BLURRED_RRECT_OPT' \ + '-DSK_IGNORE_QUAD_RR_CORNERS_OPT' \ + '-DSK_GDI_ALWAYS_USE_TEXTMETRICS_FOR_FONT_METRICS' \ + '-DSK_DEFAULT_FONT_CACHE_LIMIT=(1*1024*1024)' \ + '-DSK_USE_DISCARDABLE_SCALEDIMAGECACHE' \ + '-DSK_FONTHOST_DOES_NOT_USE_FONTMGR' \ + '-DSK_GAMMA_APPLY_TO_A8' \ + '-DSK_GAMMA_EXPONENT=1.4' \ + '-DSK_GAMMA_CONTRAST=0.0' \ + '-DSK_USE_POSIX_THREADS' \ + '-DUSE_OPENSSL=1' \ + '-DUSE_OPENSSL_CERTS=1' \ + '-DANDROID' \ + '-D__GNU_SOURCE=1' \ + '-DUSE_STLPORT=1' \ + '-D_STLP_USE_PTR_SPECIALIZATIONS=1' \ + '-DCHROME_BUILD_ID=""' \ + '-DNDEBUG' \ + '-DNVALGRIND' \ + '-DDYNAMIC_ANNOTATIONS_ENABLED=0' + + +# Include paths placed before CFLAGS/CPPFLAGS +LOCAL_C_INCLUDES_Release := \ + $(LOCAL_PATH)/third_party/skia/include/core \ + $(LOCAL_PATH)/third_party/skia/include/effects \ + $(LOCAL_PATH)/third_party/skia/src/core \ + $(LOCAL_PATH) \ + $(LOCAL_PATH)/skia/config \ + $(PWD)/frameworks/wilhelm/include \ + $(PWD)/bionic \ + $(PWD)/external/stlport/stlport + + +# Flags passed to only C++ (and not C) files. +LOCAL_CPPFLAGS_Release := \ + -fno-rtti \ + -fno-threadsafe-statics \ + -fvisibility-inlines-hidden \ + -Wno-deprecated \ + -Wno-non-virtual-dtor \ + -Wno-sign-promo \ + -Wno-non-virtual-dtor + + +LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION)) +LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION)) +LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) +LOCAL_ASFLAGS := $(LOCAL_CFLAGS) +### Rules for final target. + +LOCAL_LDFLAGS_Debug := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ + -Wl,-O1 \ + -Wl,--as-needed + + +LOCAL_LDFLAGS_Release := \ + -Wl,--fatal-warnings \ + -Wl,-z,now \ + -Wl,-z,relro \ + -Wl,-z,noexecstack \ + -fPIC \ + -m64 \ + -fuse-ld=gold \ + -nostdlib \ + -Wl,--no-undefined \ + -Wl,--exclude-libs=ALL \ + -Wl,-O1 \ + -Wl,--as-needed \ + -Wl,--gc-sections \ + -Wl,--warn-shared-textrel + + +LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) + +LOCAL_STATIC_LIBRARIES := + +# Enable grouping to fix circular references +LOCAL_GROUP_STATIC_LIBRARIES := true + +LOCAL_SHARED_LIBRARIES := \ + libstlport \ + libdl + +# Add target alias to "gyp_all_modules" target. +.PHONY: gyp_all_modules +gyp_all_modules: skia_skia_opts_ssse3_gyp + +# Alias gyp target name. +.PHONY: skia_opts_ssse3 +skia_opts_ssse3: skia_skia_opts_ssse3_gyp + +include $(BUILD_STATIC_LIBRARY) diff --git a/skia/skia_test_expectations.txt b/skia/skia_test_expectations.txt index c5cd81e437..edb6b9d830 100644 --- a/skia/skia_test_expectations.txt +++ b/skia/skia_test_expectations.txt @@ -51,8 +51,8 @@ # The Skia roll to r13482 altered the following layout tests: crbug.com/344497 [ Win ] virtual/deferred/fast/images/webp-color-profile-lossy.html [ ImageOnlyFailure ] -# Skia 13798 change to spot lights -crbug.com/352628 css3/filters/effect-combined-hw.html [ ImageOnlyFailure ] -crbug.com/352628 css3/filters/effect-reference-ordering-hw.html [ ImageOnlyFailure ] +# Roll to 13948 caused negligible changes to transformations to be rebaselined (fmalita): +crbug.com/356644 fast/canvas/image-pattern-rotate.html [ ImageOnlyFailure ] +crbug.com/356644 virtual/gpu/fast/canvas/image-object-in-canvas.html [ ImageOnlyFailure ] # END OVERRIDES HERE (this line ensures that the file is newline-terminated) |