diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-10-14 13:09:15 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-10-14 13:09:15 +0100 |
| commit | 34680572440d7894ef8dafce81d8039ed80726a2 (patch) | |
| tree | d83220a8685c3b07d9a4d22f488e4130a3fb2e84 /build | |
| parent | 12144dc038ba97fbfd95d7c49cccde498c42de8f (diff) | |
| download | chromium_org-34680572440d7894ef8dafce81d8039ed80726a2.tar.gz | |
Merge from Chromium at DEPS revision 39.0.2171.26
This commit was generated by merge_to_master.py.
Change-Id: I7e2a210cf0e24a4fbfd446a03aab3b29edbdd13a
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 15 | ||||
| -rw-r--r-- | build/ios/grit_whitelist.txt | 1 | ||||
| -rw-r--r-- | build/util/LASTCHANGE | 2 | ||||
| -rw-r--r-- | build/util/LASTCHANGE.blink | 2 |
4 files changed, 18 insertions, 2 deletions
diff --git a/build/common.gypi b/build/common.gypi index dc0f525141..17ca733131 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -5648,6 +5648,21 @@ ], }, }], + # In the android webview build, force host targets to be compiled with clang + # as the hermetic host gcc is very old on some platforms. This is already + # the default on the current development version of AOSP but we force it + # here in case we need to compile against an older release version. + ['android_webview_build==1', { + 'target_defaults': { + 'target_conditions': [ + ['_toolset=="host"', { + 'aosp_build_settings': { + 'LOCAL_CLANG': 'true', + }, + }], + ], + }, + }], # We need a special case to handle the android webview build on mac because # the host gcc there doesn't accept this flag, but the target gcc may # require it. diff --git a/build/ios/grit_whitelist.txt b/build/ios/grit_whitelist.txt index 63df8969d3..354cb50588 100644 --- a/build/ios/grit_whitelist.txt +++ b/build/ios/grit_whitelist.txt @@ -670,6 +670,7 @@ IDS_PAGEINFO_PARTIAL_ADDRESS IDS_PAGE_INFO_HELP_CENTER_LINK IDS_PAGE_INFO_INTERNAL_PAGE IDS_PAGE_INFO_SECURITY_BUTTON_ACCESSIBILITY_LABEL +IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_ERROR IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_INSECURE_CONTENT_WARNING diff --git a/build/util/LASTCHANGE b/build/util/LASTCHANGE index 9bdbfa388e..c7c12a9a93 100644 --- a/build/util/LASTCHANGE +++ b/build/util/LASTCHANGE @@ -1 +1 @@ -LASTCHANGE=267aeeb8d85c +LASTCHANGE=8247efb6c913 diff --git a/build/util/LASTCHANGE.blink b/build/util/LASTCHANGE.blink index 80db225cf6..f0643d6b08 100644 --- a/build/util/LASTCHANGE.blink +++ b/build/util/LASTCHANGE.blink @@ -1 +1 @@ -LASTCHANGE=182778 +LASTCHANGE=183629 |