Instrumented libraries: merge chromeos=1 and chromeos=0 package lists.

third_party/instrumented_libraries/instrumented_libraries.gyp

 # Copyright 2013 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.
 
 {
   'variables': {
     'verbose_libraries_build%': 0,
     'instrumented_libraries_jobs%': 1,
     'instrumented_libraries_cc%': '',
     'instrumented_libraries_cxx%': '',
@@ skipping 189 matching lines @@
         '<(_sanitizer_type)-libgdk-pixbuf2.0-0',
         '<(_sanitizer_type)-libpci3',
         '<(_sanitizer_type)-libdbusmenu-glib4',
         '<(_sanitizer_type)-libgconf-2-4',
         '<(_sanitizer_type)-libappindicator1',
         '<(_sanitizer_type)-libdbusmenu',
         '<(_sanitizer_type)-atk1.0',
         '<(_sanitizer_type)-libunity9',
         '<(_sanitizer_type)-dee',
         '<(_sanitizer_type)-libpixman-1-0',
+        '<(_sanitizer_type)-brltty',
+        '<(_sanitizer_type)-libva1',
       ],
       'conditions': [
         ['"<(_ubuntu_release)"=="precise"', {
           'dependencies': [
             '<(_sanitizer_type)-libtasn1-3',
           ],
         }, {
           'dependencies': [
             # Trusty and above.
             '<(_sanitizer_type)-libtasn1-6',
             '<(_sanitizer_type)-harfbuzz',
             '<(_sanitizer_type)-libsecret',
           ],
         }],
         ['msan==1', {
           'dependencies': [
             '<(_sanitizer_type)-libcups2',
           ],
         }],
         ['tsan==1', {
           'dependencies!': [
             '<(_sanitizer_type)-libpng12-0',
           ],
         }],
-        ['chromeos==1', {
-          'dependencies': [
-            '<(_sanitizer_type)-brltty',
-            '<(_sanitizer_type)-libva1',
-          ],
-        }]
       ],
       'direct_dependent_settings': {
         'target_conditions': [
           ['_toolset=="target"', {
             'ldflags': [
               # Add a relative RPATH entry to Chromium binaries. This puts
               # instrumented DSOs before system-installed versions in library
               # search path.
               '-Wl,-R,\$$ORIGIN/instrumented_libraries/<(_sanitizer_type)/<(_libdir)/',
               '-Wl,-z,origin',
@@ skipping 615 matching lines @@
       'extra_configure_flags': [
           '--disable-static',
           # See above.
           '--disable-introspection',
       ],
       'pre_build': 'scripts/pre-build/autoreconf.sh',
       'includes': ['standard_instrumented_package_target.gypi'],
     },
   ],
 }