diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-02-21 12:16:55 +0000 |
| commit | 5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7 (patch) | |
| tree | 5d4ae202b870bd86673f596f0d424bc4b3e55ebe /android_webview/native/webview_native.target.darwin-x86.mk | |
| parent | e862bac9c33104a29d98631d62668ae7b6676510 (diff) | |
| download | chromium_org-5d1f7b1de12d16ceb2c938c56701a3e8bfa558f7.tar.gz | |
Merge from Chromium at DEPS revision 251904
This commit was generated by merge_to_master.py.
Change-Id: I1f9543259d7d2a57d81aa41a1b84f85837439d21
Diffstat (limited to 'android_webview/native/webview_native.target.darwin-x86.mk')
| -rw-r--r-- | android_webview/native/webview_native.target.darwin-x86.mk | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/android_webview/native/webview_native.target.darwin-x86.mk b/android_webview/native/webview_native.target.darwin-x86.mk index 8c683d11f3..9e9b82cdc9 100644 --- a/android_webview/native/webview_native.target.darwin-x86.mk +++ b/android_webview/native/webview_native.target.darwin-x86.mk @@ -82,15 +82,16 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ -fdata-sections \ - -ffunction-sections + -ffunction-sections \ + -funwind-tables MY_DEFS_Debug := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -101,7 +102,6 @@ MY_DEFS_Debug := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -112,8 +112,9 @@ MY_DEFS_Debug := \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ - '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ @@ -138,7 +139,6 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/skia/config \ - $(gyp_shared_intermediate_dir)/android_webview \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH)/third_party/WebKit/Source \ @@ -155,6 +155,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/skia/ext \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ + $(gyp_shared_intermediate_dir)/android_webview \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -166,7 +167,6 @@ LOCAL_CPPFLAGS_Debug := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wsign-compare \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo @@ -199,17 +199,16 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -Wno-unused-but-set-variable \ -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ - -fno-unwind-tables \ - -fno-asynchronous-unwind-tables + -funwind-tables MY_DEFS_Release := \ - '-DANGLE_DX11' \ '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ @@ -220,7 +219,6 @@ MY_DEFS_Release := \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DCLD_VERSION=1' \ @@ -231,8 +229,9 @@ MY_DEFS_Release := \ '-DGR_GL_CUSTOM_SETUP_HEADER="GrGLConfig_chrome.h"' \ '-DSK_ENABLE_LEGACY_API_ALIASING=1' \ '-DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1' \ - '-DSK_SUPPORT_LEGACY_COLORTYPE=1' \ '-DGR_GL_IGNORE_ES3_MSAA=0' \ + '-DSK_SUPPORT_LEGACY_COMPATIBLEDEVICE_CONFIG=1' \ + '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ @@ -258,7 +257,6 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(LOCAL_PATH) \ $(LOCAL_PATH)/skia/config \ - $(gyp_shared_intermediate_dir)/android_webview \ $(LOCAL_PATH)/third_party/khronos \ $(LOCAL_PATH)/gpu \ $(LOCAL_PATH)/third_party/WebKit/Source \ @@ -275,6 +273,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/skia/ext \ $(PWD)/external/icu4c/common \ $(PWD)/external/icu4c/i18n \ + $(gyp_shared_intermediate_dir)/android_webview \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -286,7 +285,6 @@ LOCAL_CPPFLAGS_Release := \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ -Wsign-compare \ - -Wno-error=c++0x-compat \ -Wno-non-virtual-dtor \ -Wno-sign-promo |