diff options
author | Bo Liu <boliu@google.com> | 2014-05-01 10:37:37 -0700 |
---|---|---|
committer | Bo Liu <boliu@google.com> | 2014-05-01 10:37:37 -0700 |
commit | 5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1 (patch) | |
tree | 5df224c921d52ab02739b38e2149652208b023e6 /android_webview/native/webview_native.target.darwin-x86.mk | |
parent | 56e9d6e218656f3d05620cc9877fd61482337fb1 (diff) | |
download | chromium_org-5c02ac1a9c1b504631c0a3d2b6e737b5d738bae1.tar.gz |
Merge from Chromium at DEPS revision 267519
This commit was generated by merge_to_master.py.
Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
Diffstat (limited to 'android_webview/native/webview_native.target.darwin-x86.mk')
-rw-r--r-- | android_webview/native/webview_native.target.darwin-x86.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/android_webview/native/webview_native.target.darwin-x86.mk b/android_webview/native/webview_native.target.darwin-x86.mk index 44b72adafb..bd3eebc3b3 100644 --- a/android_webview/native/webview_native.target.darwin-x86.mk +++ b/android_webview/native/webview_native.target.darwin-x86.mk @@ -118,12 +118,13 @@ MY_DEFS_Debug := \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ - '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ - '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ - '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ + '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ @@ -248,12 +249,13 @@ MY_DEFS_Release := \ '-DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT' \ '-DSK_SUPPORT_LEGACY_PUBLICEFFECTCONSTRUCTORS=1' \ '-DSK_SUPPORT_LEGACY_GETTOPDEVICE' \ - '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ - '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ - '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_N32_NAME' \ '-DSK_SUPPORT_LEGACY_PROCXFERMODE' \ + '-DSK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES' \ '-DSK_SUPPORT_LEGACY_PICTURE_HEADERS' \ + '-DSK_SUPPORT_LEGACY_PICTURE_CAN_RECORD' \ + '-DSK_SUPPORT_DEPRECATED_RECORD_FLAGS' \ + '-DSK_SUPPORT_LEGACY_BLURMASKFILTER_STYLE' \ '-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \ '-DSK_BUILD_FOR_ANDROID' \ '-DSK_USE_POSIX_THREADS' \ |