diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-08-12 13:47:38 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-08-12 13:47:38 +0100 |
| commit | 5f1c94371a64b3196d4be9466099bb892df9b88e (patch) | |
| tree | 60a287ed27d1328d7806d12433d789b66ad91805 /components/visitedlink_renderer.target.darwin-x86_64.mk | |
| parent | 43165a58c6167882aabb62f470c4e4d21f807d79 (diff) | |
| download | chromium_org-5f1c94371a64b3196d4be9466099bb892df9b88e.tar.gz | |
Merge from Chromium at DEPS revision 288042
This commit was generated by merge_to_master.py.
Change-Id: I583602ff16d735199f1810565c9296e970ce2854
Diffstat (limited to 'components/visitedlink_renderer.target.darwin-x86_64.mk')
| -rw-r--r-- | components/visitedlink_renderer.target.darwin-x86_64.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/visitedlink_renderer.target.darwin-x86_64.mk b/components/visitedlink_renderer.target.darwin-x86_64.mk index 7e795e1617..333e539933 100644 --- a/components/visitedlink_renderer.target.darwin-x86_64.mk +++ b/components/visitedlink_renderer.target.darwin-x86_64.mk @@ -80,7 +80,6 @@ MY_DEFS_Debug := \ '-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/"' \ @@ -106,6 +105,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ + '-DU_ENABLE_DYLOAD=0' \ '-DCHROME_PNG_WRITE_SUPPORT' \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ @@ -148,8 +148,8 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/skia/include/ports \ $(LOCAL_PATH)/third_party/skia/include/utils \ $(LOCAL_PATH)/skia/ext \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(LOCAL_PATH)/third_party/npapi \ $(LOCAL_PATH)/third_party/npapi/bindings \ $(LOCAL_PATH)/v8/include \ @@ -229,7 +229,6 @@ MY_DEFS_Release := \ '-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/"' \ @@ -255,6 +254,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ + '-DU_ENABLE_DYLOAD=0' \ '-DCHROME_PNG_WRITE_SUPPORT' \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ @@ -298,8 +298,8 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/skia/include/ports \ $(LOCAL_PATH)/third_party/skia/include/utils \ $(LOCAL_PATH)/skia/ext \ - $(PWD)/external/icu4c/common \ - $(PWD)/external/icu4c/i18n \ + $(PWD)/external/icu/icu4c/source/common \ + $(PWD)/external/icu/icu4c/source/i18n \ $(LOCAL_PATH)/third_party/npapi \ $(LOCAL_PATH)/third_party/npapi/bindings \ $(LOCAL_PATH)/v8/include \ |