Chromium side of http://codereview.chromium.org/42394...

build/common.gypi

 # Copyright (c) 2009 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': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
     # code, as opposed to external code.  This variable is used to control
     # such things as the set of warnings to enable, and whether warnings are
     # treated as errors.
@@ skipping 71 matching lines @@
             'configuration_platform': 'Win32',
             'msvs_props': ['release.vsprops'],
           }],
         ],
       },
     },
   },
   'conditions': [
     ['OS=="mac"', {
       'target_defaults': {
+        'mac_bundle': 0,
         'xcode_settings': {
           'ALWAYS_SEARCH_USER_PATHS': 'NO',
           'GCC_C_LANGUAGE_STANDARD': 'c99',
           'GCC_CW_ASM_SYNTAX': 'NO',
           'GCC_DYNAMIC_NO_PIC': 'YES',
           'GCC_ENABLE_PASCAL_STRINGS': 'NO',
           'GCC_INLINES_ARE_PRIVATE_EXTERN': 'YES',
           'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
           'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
           'GCC_VERSION': '4.2',
           'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',
           'MACOSX_DEPLOYMENT_TARGET': '10.5',
           'PREBINDING': 'NO',
           'SDKROOT': 'macosx10.5',
           'USE_HEADERMAP': 'NO',
           'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'],
           'conditions': [
             ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
                                  {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}],
           ],
         },
         'target_conditions': [
           ['_type=="shared_library"', {
             'xcode_settings': {'GCC_DYNAMIC_NO_PIC': 'NO'},
           }],
           ['_type!="static_library"', {
             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
           }],
-          ['_type=="application"', {
+          ['_type=="executable" and _mac_bundle==1', {

[Mark Mentovai, 2009/03/19 17:04:53]

Let's just do _mac_bundle without the ==1, since it's supposed to be a boolean.

             'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
           }],
-          ['_type=="application" or _type=="executable"', {
+          ['_type=="executable"', {
             'postbuilds': [
               {
                 'variables': {
                   # Define strip_from_xcode in a variable ending in _path so
                   # that gyp understands it's a path and performs proper
                   # relativization during dict merging.
                   'strip_from_xcode_path': 'mac/strip_from_xcode',
                 },
                 'postbuild_name': 'Strip If Needed',
                 'action': ['<(strip_from_xcode_path)'],
@@ skipping 93 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',
   },
 }