Remove redundant OS checks in chrome_shell.gypi

chrome_shell.gypi is only included if OS=="android" so there is no reason
to test it again.

BUG=none

Review URL: https://codereview.chromium.org/810193006

Cr-Commit-Position: refs/heads/master@{#311517}

chrome/android/BUILD.gn

@@ -188,12 +188,8 @@ static_library("chrome_shell_base") {
 
   # TODO(GYP):
   #[ 'order_profiling!=0', {
-  #'conditions': [
-  #[ 'OS=="android"', {
   #'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
   #}],
-  #],
-  #}],
 }
 
 # GYP: //chrome/chrome_shell.gypi:libchromeshell

chrome/chrome_shell.gypi

@@ -28,14 +28,17 @@
       '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', ],
         }],
-          ],
-        }],
         [ 'use_allocator!="none"', {
           'dependencies': [
             '../base/allocator/allocator.gyp:allocator', ],
@@ -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',
-            ],
-          },
-        }],
       ],
     },
     {