Move conditionals inside target_defaults.

build/standalone.gypi

 # Copyright 2014 PDFium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Definitions to be used when building stand-alone PDFium binaries.
 
 {
   'variables': {
     'component%': 'static_library',
     'clang%': 0,
@@ skipping 225 matching lines @@
       'OTHER_CFLAGS': [
         '-fno-strict-aliasing',
       ],
       'WARNING_CFLAGS': [
         '-Wall',
         '-Wendif-labels',
         '-W',
         '-Wno-unused-parameter',
       ],
     },
-  },
-  'conditions': [
-    ['component=="shared_library"', {
-      'cflags': [
-        '-fPIC',
-      ],
-    }],
-    ['OS=="win"', {
-      'target_defaults': {
+    'conditions': [
+      ['component=="shared_library"', {
+        'cflags': [
+          '-fPIC',
+        ],
+      }],
+      ['OS=="win"', {
         'defines': [
           'NOMINMAX',
           '_CRT_SECURE_NO_DEPRECATE',
           '_CRT_NONSTDC_NO_DEPRECATE',
         ],
         'conditions': [
           ['component=="static_library"', {
             'defines': [
-              '_HAS_EXCEPTIONS=0',
-            ],
+             '_HAS_EXCEPTIONS=0',

[Lei Zhang, 2015/10/16 01:32:35]

Need an extra space indentation here and on the next line? Make sure there's no
tabs please.

[dsinclair, 2015/10/16 01:43:34]

Done.

As far as I can tell there are no tabs (all my editors should be inserting
spaces)

+           ],
           }],
         ],
-      },
-    }],  # OS=="win"
-    ['OS=="mac"', {
-      'target_defaults': {
+      }],  # OS=="win"
+      ['OS=="mac"', {
         'target_conditions': [
           ['_type!="static_library"', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
           }],
         ],  # target_conditions
-      },  # target_defaults
-    }],  # OS=="mac"
-    ['v8_use_external_startup_data==1', {
-      'target_defaults': {
+      }],  # OS=="mac"
+      ['v8_use_external_startup_data==1', {
         'defines': [
           'V8_USE_EXTERNAL_STARTUP_DATA',
         ],
-      },
-    }],  # v8_use_external_startup_data==1
-  ],
+      }],  # v8_use_external_startup_data==1
+    ],
+  },
   'xcode_settings': {
     # See comment in Chromium's common.gypi for why this is needed.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   }
 }