| Index: chrome/chrome_shell.gypi
|
| diff --git a/chrome/chrome_shell.gypi b/chrome/chrome_shell.gypi
|
| index 83bbb9592c1a3e1d5574b20f921828ea535d9a5c..dd7c11027d93cf96bc18dd4692ada1c47ca9ad07 100644
|
| --- a/chrome/chrome_shell.gypi
|
| +++ b/chrome/chrome_shell.gypi
|
| @@ -28,13 +28,16 @@
|
| 'include_dirs': [
|
| '../skia/config',
|
| ],
|
| + 'direct_dependent_settings': {
|
| + 'ldflags': [
|
| + # Some android targets still depend on --gc-sections to link.
|
| + # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
|
| + '-Wl,--gc-sections',
|
| + ],
|
| + },
|
| 'conditions': [
|
| [ 'order_profiling!=0', {
|
| - 'conditions': [
|
| - [ 'OS=="android"', {
|
| - 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
|
| - }],
|
| - ],
|
| + 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
|
| }],
|
| [ 'use_allocator!="none"', {
|
| 'dependencies': [
|
| @@ -45,15 +48,6 @@
|
| # Chrome shell should always use the statically-linked CLD data.
|
| '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_static', ],
|
| }],
|
| - ['OS=="android"', {
|
| - 'direct_dependent_settings': {
|
| - 'ldflags': [
|
| - # Some android targets still depend on --gc-sections to link.
|
| - # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
|
| - '-Wl,--gc-sections',
|
| - ],
|
| - },
|
| - }],
|
| ],
|
| },
|
| {
|
|
|