Move conditionals inside target_defaults.

build/standalone.gypi

Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index c0eaef419df30e2ff6538aed44e0940d87aa128d..7b2e3db1d71498147efaa07eda5c9189af521426 100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -243,46 +243,46 @@
         '-Wno-unused-parameter',
       ],
     },
-  },
-  'conditions': [
-    ['component=="shared_library"', {
-      'cflags': [
-        '-fPIC',
-      ],
-    }],
-    ['OS=="win"', {
-      'target_defaults': {
-        'defines': [
-          'NOMINMAX',
-          '_CRT_SECURE_NO_DEPRECATE',
-          '_CRT_NONSTDC_NO_DEPRECATE',
-        ],
-        'conditions': [
-          ['component=="static_library"', {
-            'defines': [
-              '_HAS_EXCEPTIONS=0',
-            ],
-          }],
-        ],
-      },
-    }],  # OS=="win"
-    ['OS=="mac"', {
-      'target_defaults': {
-        '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': {
-        'defines': [
-          'V8_USE_EXTERNAL_STARTUP_DATA',
+    'conditions': [
+      ['component=="shared_library"', {

[Tom Sepez, 2015/10/15 20:26:56]

We'd want to this to apply to a release build as well.  Does that happen?

[Tom Sepez, 2015/10/15 20:38:14]

(I think it happens, but confirm).

[dsinclair, 2015/10/15 21:02:14]

Seems too, I'm able to complete 'ninja -C out/Release'.

+        'cflags': [
+          '-fPIC',
         ],
-      },
-    }],  # v8_use_external_startup_data==1
-  ],
+      }],
+      ['OS=="win"', {
+        'target_defaults': {

[Tom Sepez, 2015/10/15 20:25:50]

These target_defaults blocks may be redundant inside target_defaults.

[dsinclair, 2015/10/15 21:02:14]

Done.

+          'defines': [
+            'NOMINMAX',
+            '_CRT_SECURE_NO_DEPRECATE',
+            '_CRT_NONSTDC_NO_DEPRECATE',
+          ],
+          'conditions': [
+            ['component=="static_library"', {
+              'defines': [
+                '_HAS_EXCEPTIONS=0',
+              ],
+            }],
+          ],
+        },
+      }],  # OS=="win"
+      ['OS=="mac"', {
+        'target_defaults': {
+          'target_conditions': [

[Tom Sepez, 2015/10/15 20:25:50]

But this may have to remain target_conditions even after pulling the
target_defaults above.

[dsinclair, 2015/10/15 21:02:14]

Done.

+            ['_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': {
+          'defines': [
+            'V8_USE_EXTERNAL_STARTUP_DATA',
+          ],
+        },
+      }],  # v8_use_external_startup_data==1
+    ],
+  },
   'xcode_settings': {
     # See comment in Chromium's common.gypi for why this is needed.
     'SYMROOT': '<(DEPTH)/xcodebuild',