Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib2112ed87a48d7a6d9c0563ba71850716d1475ef
diff --git a/Source/core/webcore_platform_geometry.target.darwin-x86.mk b/Source/core/webcore_platform_geometry.target.darwin-x86.mk
index de5ab8e..9ae7c3c 100644
--- a/Source/core/webcore_platform_geometry.target.darwin-x86.mk
+++ b/Source/core/webcore_platform_geometry.target.darwin-x86.mk
@@ -38,7 +38,7 @@
# Flags passed to both C and C++ files.
-MY_CFLAGS := \
+MY_CFLAGS_Debug := \
--param=ssp-buffer-size=4 \
-fno-exceptions \
-fno-strict-aliasing \
@@ -75,9 +75,7 @@
-fdata-sections \
-ffunction-sections
-MY_CFLAGS_C :=
-
-MY_DEFS := \
+MY_DEFS_Debug := \
'-DANGLE_DX11' \
'-D_FILE_OFFSET_BITS=64' \
'-DUSE_LINUX_BREAKPAD' \
@@ -99,11 +97,11 @@
'-DENABLE_CSS_REGIONS=1' \
'-DENABLE_CUSTOM_SCHEME_HANDLER=0' \
'-DENABLE_ENCRYPTED_MEDIA_V2=1' \
- '-DENABLE_GRAPHICS_CONTEXT_ANNOTATIONS=0' \
'-DENABLE_SVG_FONTS=1' \
'-DENABLE_TOUCH_ICON_LOADING=1' \
'-DENABLE_XHR_TIMEOUT=0' \
'-DENABLE_GDI_FONTS_ON_WINDOWS=1' \
+ '-DENABLE_PARTITION_ALLOC=1' \
'-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
'-DENABLE_CALENDAR_PICKER=0' \
'-DENABLE_FAST_MOBILE_SCROLLING=1' \
@@ -118,7 +116,6 @@
'-DENABLE_8BIT_TEXTRUN=1' \
'-DENABLE_OPENTYPE_VERTICAL=1' \
'-DWTF_USE_HARFBUZZ=1' \
- '-DENABLE_PARTITION_ALLOC=1' \
'-DU_USING_ICU_NAMESPACE=0' \
'-DSK_BUILD_NO_IMAGE_ENCODE' \
'-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \
@@ -141,10 +138,9 @@
'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
'-D_DEBUG'
-LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := \
+LOCAL_C_INCLUDES_Debug := \
$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
@@ -166,6 +162,7 @@
$(LOCAL_PATH)/third_party/skia/include/pdf \
$(LOCAL_PATH)/third_party/skia/include/gpu \
$(LOCAL_PATH)/third_party/skia/include/gpu/gl \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
$(LOCAL_PATH)/third_party/skia/include/pathops \
$(LOCAL_PATH)/third_party/skia/include/pipe \
$(LOCAL_PATH)/third_party/skia/include/ports \
@@ -189,10 +186,9 @@
$(PWD)/bionic \
$(PWD)/external/stlport/stlport
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES)
# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS := \
+LOCAL_CPPFLAGS_Debug := \
-fno-rtti \
-fno-threadsafe-statics \
-fvisibility-inlines-hidden \
@@ -203,9 +199,178 @@
-Wno-sign-promo \
-Wno-non-virtual-dtor
+
+# Flags passed to both C and C++ files.
+MY_CFLAGS_Release := \
+ --param=ssp-buffer-size=4 \
+ -fno-exceptions \
+ -fno-strict-aliasing \
+ -Wno-unused-parameter \
+ -Wno-missing-field-initializers \
+ -fvisibility=hidden \
+ -pipe \
+ -fPIC \
+ -Wno-format \
+ -m32 \
+ -mmmx \
+ -march=pentium4 \
+ -msse2 \
+ -mfpmath=sse \
+ -fuse-ld=gold \
+ -ffunction-sections \
+ -funwind-tables \
+ -g \
+ -fno-short-enums \
+ -finline-limit=64 \
+ -Wa,--noexecstack \
+ -U_FORTIFY_SOURCE \
+ -Wno-extra \
+ -Wno-ignored-qualifiers \
+ -Wno-type-limits \
+ -Wno-address \
+ -Wno-format-security \
+ -Wno-return-type \
+ -Wno-sequence-point \
+ -fno-stack-protector \
+ -Os \
+ -fno-ident \
+ -fdata-sections \
+ -ffunction-sections \
+ -fomit-frame-pointer \
+ -fno-unwind-tables \
+ -fno-asynchronous-unwind-tables
+
+MY_DEFS_Release := \
+ '-DANGLE_DX11' \
+ '-D_FILE_OFFSET_BITS=64' \
+ '-DUSE_LINUX_BREAKPAD' \
+ '-DNO_TCMALLOC' \
+ '-DDISABLE_NACL' \
+ '-DCHROMIUM_BUILD' \
+ '-DUSE_LIBJPEG_TURBO=1' \
+ '-DUSE_PROPRIETARY_CODECS' \
+ '-DENABLE_GPU=1' \
+ '-DUSE_OPENSSL=1' \
+ '-DENABLE_EGLIMAGE=1' \
+ '-DENABLE_LANGUAGE_DETECTION=1' \
+ '-DWEBCORE_NAVIGATOR_VENDOR="Google Inc."' \
+ '-DWEBKIT_IMPLEMENTATION=1' \
+ '-DINSIDE_WEBKIT' \
+ '-DENABLE_CANVAS_USES_MAILBOX=1' \
+ '-DENABLE_CSS3_TEXT=0' \
+ '-DENABLE_CSS_EXCLUSIONS=1' \
+ '-DENABLE_CSS_REGIONS=1' \
+ '-DENABLE_CUSTOM_SCHEME_HANDLER=0' \
+ '-DENABLE_ENCRYPTED_MEDIA_V2=1' \
+ '-DENABLE_SVG_FONTS=1' \
+ '-DENABLE_TOUCH_ICON_LOADING=1' \
+ '-DENABLE_XHR_TIMEOUT=0' \
+ '-DENABLE_GDI_FONTS_ON_WINDOWS=1' \
+ '-DENABLE_PARTITION_ALLOC=1' \
+ '-DWTF_USE_CONCATENATED_IMPULSE_RESPONSES=1' \
+ '-DENABLE_CALENDAR_PICKER=0' \
+ '-DENABLE_FAST_MOBILE_SCROLLING=1' \
+ '-DENABLE_INPUT_SPEECH=0' \
+ '-DENABLE_LEGACY_NOTIFICATIONS=0' \
+ '-DENABLE_MEDIA_CAPTURE=1' \
+ '-DENABLE_NOTIFICATIONS=0' \
+ '-DENABLE_ORIENTATION_EVENTS=1' \
+ '-DENABLE_PRINTING=0' \
+ '-DENABLE_NAVIGATOR_CONTENT_UTILS=0' \
+ '-DWTF_USE_NATIVE_FULLSCREEN_VIDEO=1' \
+ '-DENABLE_8BIT_TEXTRUN=1' \
+ '-DENABLE_OPENTYPE_VERTICAL=1' \
+ '-DWTF_USE_HARFBUZZ=1' \
+ '-DU_USING_ICU_NAMESPACE=0' \
+ '-DSK_BUILD_NO_IMAGE_ENCODE' \
+ '-DSK_DEFERRED_CANVAS_USES_GPIPE=1' \
+ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \
+ '-DGR_AGGRESSIVE_SHADER_OPTS=1' \
+ '-DSK_ENABLE_INST_COUNT=0' \
+ '-DSK_USE_POSIX_THREADS' \
+ '-DSK_BUILD_FOR_ANDROID' \
+ '-DCHROME_PNG_WRITE_SUPPORT' \
+ '-DPNG_USER_CONFIG' \
+ '-DLIBXML_STATIC' \
+ '-DLIBXSLT_STATIC' \
+ '-DUSE_SYSTEM_LIBJPEG' \
+ '-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/icui18n/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
+ $(LOCAL_PATH)/third_party/khronos \
+ $(LOCAL_PATH)/gpu \
+ $(LOCAL_PATH) \
+ $(LOCAL_PATH)/third_party/WebKit \
+ $(LOCAL_PATH)/third_party/WebKit/Source \
+ $(gyp_shared_intermediate_dir)/webkit \
+ $(gyp_shared_intermediate_dir)/webkit/bindings \
+ $(LOCAL_PATH)/third_party/angle_dx11/include/GLSLANG \
+ $(PWD)/external/icu4c/common \
+ $(PWD)/external/icu4c/i18n \
+ $(LOCAL_PATH)/skia/config \
+ $(LOCAL_PATH)/third_party/skia/src/core \
+ $(LOCAL_PATH)/third_party/skia/include/config \
+ $(LOCAL_PATH)/third_party/skia/include/core \
+ $(LOCAL_PATH)/third_party/skia/include/effects \
+ $(LOCAL_PATH)/third_party/skia/include/pdf \
+ $(LOCAL_PATH)/third_party/skia/include/gpu \
+ $(LOCAL_PATH)/third_party/skia/include/gpu/gl \
+ $(LOCAL_PATH)/third_party/skia/include/lazy \
+ $(LOCAL_PATH)/third_party/skia/include/pathops \
+ $(LOCAL_PATH)/third_party/skia/include/pipe \
+ $(LOCAL_PATH)/third_party/skia/include/ports \
+ $(LOCAL_PATH)/third_party/skia/include/utils \
+ $(LOCAL_PATH)/skia/ext \
+ $(LOCAL_PATH)/third_party/iccjpeg \
+ $(LOCAL_PATH)/third_party/libpng \
+ $(LOCAL_PATH)/third_party/libwebp \
+ $(LOCAL_PATH)/third_party/libxml/linux/include \
+ $(LOCAL_PATH)/third_party/libxml/src/include \
+ $(LOCAL_PATH)/third_party/libxslt \
+ $(LOCAL_PATH)/third_party/npapi \
+ $(LOCAL_PATH)/third_party/npapi/bindings \
+ $(LOCAL_PATH)/third_party/ots/include \
+ $(LOCAL_PATH)/third_party/qcms/src \
+ $(LOCAL_PATH)/third_party/sqlite \
+ $(LOCAL_PATH)/third_party/zlib \
+ $(LOCAL_PATH)/v8/include \
+ $(PWD)/external/jpeg \
+ $(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-c++0x-compat \
+ -Wno-deprecated \
+ -Wno-error=c++0x-compat \
+ -Wno-non-virtual-dtor \
+ -Wno-sign-promo \
+ -Wno-non-virtual-dtor
+
+
+LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
+LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
+LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
### Rules for final target.
-LOCAL_LDFLAGS := \
+LOCAL_LDFLAGS_Debug := \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -220,6 +385,23 @@
-Wl,--as-needed
+LOCAL_LDFLAGS_Release := \
+ -Wl,-z,now \
+ -Wl,-z,relro \
+ -Wl,-z,noexecstack \
+ -fPIC \
+ -m32 \
+ -fuse-ld=gold \
+ -nostdlib \
+ -Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
+ -Wl,-O1 \
+ -Wl,--as-needed \
+ -Wl,--gc-sections
+
+
+LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
+
LOCAL_STATIC_LIBRARIES := \
skia_skia_gyp