diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-12-18 16:25:09 +0000 |
| commit | a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7 (patch) | |
| tree | dafc1c6417406a7fbd422ad0bb890e96909ef564 /url/url_lib.target.linux-arm.mk | |
| parent | d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f (diff) | |
| download | chromium_org-a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7.tar.gz | |
Merge from Chromium at DEPS revision 240154
This commit was generated by merge_to_master.py.
Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e
Diffstat (limited to 'url/url_lib.target.linux-arm.mk')
| -rw-r--r-- | url/url_lib.target.linux-arm.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/url/url_lib.target.linux-arm.mk b/url/url_lib.target.linux-arm.mk index 7b894ea9dd..76b5ce87ec 100644 --- a/url/url_lib.target.linux-arm.mk +++ b/url/url_lib.target.linux-arm.mk @@ -11,7 +11,6 @@ gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared) # Make sure our deps are built first. GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_icu_icudata_gyp)/icudata.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icui18n_gyp)/icui18n.stamp \ $(call intermediates-dir-for,GYP,third_party_icu_icuuc_gyp)/icuuc.stamp @@ -40,6 +39,7 @@ LOCAL_SRC_FILES := \ url/url_canon_pathurl.cc \ url/url_canon_query.cc \ url/url_canon_relative.cc \ + url/url_canon_stdstring.cc \ url/url_canon_stdurl.cc \ url/url_parse_file.cc \ url/url_util.cc @@ -80,6 +80,7 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DANGLE_DX11' \ + '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -89,9 +90,11 @@ 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' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DURL_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ @@ -167,6 +170,7 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DANGLE_DX11' \ + '-DV8_DEPRECATION_WARNINGS' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISABLE_NACL' \ @@ -176,9 +180,11 @@ 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' \ + '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DURL_IMPLEMENTATION' \ '-DU_USING_ICU_NAMESPACE=0' \ |