Merge from Chromium at DEPS revision 284076
This commit was generated by merge_to_master.py.
Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
diff --git a/skia/skia_opts_neon.target.darwin-arm.mk b/skia/skia_opts_neon.target.darwin-arm.mk
index 7092ecc..96f5987 100644
--- a/skia/skia_opts_neon.target.darwin-arm.mk
+++ b/skia/skia_opts_neon.target.darwin-arm.mk
@@ -23,15 +23,16 @@
GYP_COPIED_SOURCE_ORIGIN_DIRS :=
LOCAL_SRC_FILES := \
- third_party/skia/src/opts/memset16_neon.S \
- third_party/skia/src/opts/memset32_neon.S \
third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp \
third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp \
third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp \
third_party/skia/src/opts/SkBlitRow_opts_arm_neon.cpp \
- third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp \
third_party/skia/src/opts/SkBlurImage_opts_neon.cpp \
- third_party/skia/src/opts/SkMorphology_opts_neon.cpp
+ third_party/skia/src/opts/SkMorphology_opts_neon.cpp \
+ third_party/skia/src/opts/SkTextureCompression_opts_neon.cpp \
+ third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp \
+ third_party/skia/src/opts/memset16_neon.S \
+ third_party/skia/src/opts/memset32_neon.S
# Flags passed to both C and C++ files.
@@ -75,9 +76,9 @@
-Wno-sequence-point \
-Os \
-g \
- -fomit-frame-pointer \
-fdata-sections \
-ffunction-sections \
+ -fomit-frame-pointer \
-funwind-tables
MY_DEFS_Debug := \
@@ -96,6 +97,7 @@
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -111,18 +113,13 @@
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_BITMAP_CONFIG' \
- '-DSK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE' \
- '-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_SETCONFIG' \
+ '-DSK_SUPPORT_LEGACY_PICTURE_CLONE' \
+ '-DSK_SUPPORT_LEGACY_GETDEVICE' \
'-DSK_IGNORE_ETC1_SUPPORT' \
'-DSK_IGNORE_GPU_DITHER' \
- '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-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' \
@@ -154,6 +151,7 @@
$(LOCAL_PATH)/third_party/skia/include/effects \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(PWD)/frameworks/wilhelm/include \
@@ -168,6 +166,9 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
+ -std=gnu++11 \
+ -Wno-narrowing \
+ -Wno-literal-suffix \
-Wno-non-virtual-dtor \
-Wno-sign-promo \
-Wno-non-virtual-dtor
@@ -235,6 +236,7 @@
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
+ '-DCLD_DATA_FROM_STATIC' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
'-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \
@@ -250,18 +252,13 @@
'-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \
'-DGR_GL_IGNORE_ES3_MSAA=0' \
'-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \
- '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \
- '-DSK_SUPPORT_LEGACY_BITMAP_CONFIG' \
- '-DSK_SUPPORT_LEGACY_DEVICE_VIRTUAL_ISOPAQUE' \
- '-DSK_SUPPORT_LEGACY_N32_NAME' \
- '-DSK_SUPPORT_LEGACY_SETCONFIG' \
+ '-DSK_SUPPORT_LEGACY_PICTURE_CLONE' \
+ '-DSK_SUPPORT_LEGACY_GETDEVICE' \
'-DSK_IGNORE_ETC1_SUPPORT' \
'-DSK_IGNORE_GPU_DITHER' \
- '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-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' \
@@ -293,6 +290,7 @@
$(LOCAL_PATH)/third_party/skia/include/effects \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/third_party/skia/src/opts \
+ $(LOCAL_PATH)/third_party/skia/src/utils \
$(LOCAL_PATH) \
$(LOCAL_PATH)/skia/config \
$(PWD)/frameworks/wilhelm/include \
@@ -307,6 +305,9 @@
-fvisibility-inlines-hidden \
-Wno-deprecated \
-Wno-abi \
+ -std=gnu++11 \
+ -Wno-narrowing \
+ -Wno-literal-suffix \
-Wno-non-virtual-dtor \
-Wno-sign-promo \
-Wno-non-virtual-dtor