Linux: Remove some ChromeOS linker flag workarounds now that full ChromeOS builds set the flags exp…

build/common.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 731 matching lines @@
         # be used except on x86 and x86-64 (the only two architectures which
         # are currently checke in).  Force this off via GYP_DEFINES when you
         # are using a custom toolchain and need to control -B in cflags.
         ['OS=="linux" and (target_arch=="x64")', {
           'linux_use_bundled_binutils%': 1,
         }, {
           'linux_use_bundled_binutils%': 0,
         }],
 
         # linux_use_gold_flags: whether to use build flags that rely on gold.
-        # On by default for x64 Linux.  Temporarily off for ChromeOS as
-        # it failed on a buildbot.

[Lei Zhang, 2014/04/18 06:42:40]

The .ebuild controls this for full ChromeOS builds now.
For ChromeOS on Linux builds, this should just work like any other Linux build.

-        ['OS=="linux" and target_arch=="x64" and chromeos==0', {
+        # On by default for x64 Linux.
+        ['OS=="linux" and target_arch=="x64"', {
           'linux_use_gold_flags%': 1,
         }, {
           'linux_use_gold_flags%': 0,
         }],
 
         ['OS=="android" or OS=="ios"', {
           'enable_captive_portal_detection%': 0,
         }, {
           'enable_captive_portal_detection%': 1,
         }],
@@ skipping 3024 matching lines @@
                   # Avoids errors with current NDK:
                   # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426:3: error: argument must be a constant"
                   '-finstrument-functions-exclude-file-list=arm_neon.h',
                 ],
               }],
             ],
           }],
           ['linux_dump_symbols==1', {
             'cflags': [ '-g' ],
             'conditions': [
-              # TODO(thestig) We should not need to specify chromeos==0 here,
-              # but somehow ChromeOS uses gold despite linux_use_bundled_gold==0.
-              # http://crbug.com./360082
-              ['linux_use_bundled_gold==0 and chromeos==0 and OS!="android"', {
+              ['linux_use_gold_flags==0 and OS!="android"', {
                 'target_conditions': [
                   ['_toolset=="target"', {
                     'ldflags': [
                       # Workarounds for linker OOM.
                       '-Wl,--no-keep-memory',
                       '-Wl,--reduce-memory-overheads',
                     ],
                   }],
                 ],
               }],
@@ skipping 1390 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }