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/autofill_content_browser.target.darwin-arm.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/autofill_content_browser.target.darwin-arm.mk')
| -rw-r--r-- | components/autofill_content_browser.target.darwin-arm.mk | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/components/autofill_content_browser.target.darwin-arm.mk b/components/autofill_content_browser.target.darwin-arm.mk index 4c409d4da1..8647a5ea99 100644 --- a/components/autofill_content_browser.target.darwin-arm.mk +++ b/components/autofill_content_browser.target.darwin-arm.mk @@ -106,7 +106,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/"' \ @@ -132,6 +131,7 @@ MY_DEFS_Debug := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ + '-DU_ENABLE_DYLOAD=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ '-DEXPAT_RELATIVE_PATH' \ @@ -140,6 +140,7 @@ MY_DEFS_Debug := \ '-DNO_SOUND_SYSTEM' \ '-DANDROID' \ '-DPOSIX' \ + '-DWEBRTC_POSIX' \ '-DI18N_PHONENUMBERS_USE_ICU_REGEXP=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -181,14 +182,13 @@ 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/webrtc/overrides \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ - $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/testing/gtest/include \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/webrtc \ $(PWD)/external/expat/lib \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(LOCAL_PATH)/third_party/libphonenumber/src \ @@ -273,7 +273,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/"' \ @@ -299,6 +298,7 @@ MY_DEFS_Release := \ '-DSK_USE_POSIX_THREADS' \ '-DSK_DEFERRED_CANVAS_USES_FACTORIES=1' \ '-DU_USING_ICU_NAMESPACE=0' \ + '-DU_ENABLE_DYLOAD=0' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ '-DEXPAT_RELATIVE_PATH' \ @@ -307,6 +307,7 @@ MY_DEFS_Release := \ '-DNO_SOUND_SYSTEM' \ '-DANDROID' \ '-DPOSIX' \ + '-DWEBRTC_POSIX' \ '-DI18N_PHONENUMBERS_USE_ICU_REGEXP=1' \ '-DPROTOBUF_USE_DLLS' \ '-DGOOGLE_PROTOBUF_NO_RTTI' \ @@ -349,14 +350,13 @@ 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/webrtc/overrides \ $(LOCAL_PATH)/third_party/libjingle/overrides \ $(LOCAL_PATH)/third_party/libjingle/source \ - $(LOCAL_PATH)/third_party/webrtc/overrides \ $(LOCAL_PATH)/testing/gtest/include \ $(LOCAL_PATH)/third_party \ - $(LOCAL_PATH)/third_party/webrtc \ $(PWD)/external/expat/lib \ $(gyp_shared_intermediate_dir)/protoc_out/third_party/libphonenumber \ $(LOCAL_PATH)/third_party/libphonenumber/src \ |