| Index: build/common.gypi
|
| diff --git a/build/common.gypi b/build/common.gypi
|
| index 7541519ea06784b5b3df681b94036e6def536f92..20aabc2f25cdeb777cdca56b5b0fbaa3e7717695 100644
|
| --- a/build/common.gypi
|
| +++ b/build/common.gypi
|
| @@ -5585,7 +5585,9 @@
|
| # 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.
|
| + # here in case we need to compile against an older release version. We also
|
| + # explicitly set it to false for target binaries to avoid causing problems
|
| + # for the work to enable clang by default in AOSP.
|
| ['android_webview_build==1', {
|
| 'target_defaults': {
|
| 'target_conditions': [
|
| @@ -5593,6 +5595,10 @@
|
| 'aosp_build_settings': {
|
| 'LOCAL_CLANG': 'true',
|
| },
|
| + }, { # else: _toolset != "host"
|
| + 'aosp_build_settings': {
|
| + 'LOCAL_CLANG': 'false',
|
| + },
|
| }],
|
| ],
|
| },
|
|
|