| OLD | NEW | 
|     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |     1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|     2 # Use of this source code is governed by a BSD-style license that can be |     2 # Use of this source code is governed by a BSD-style license that can be | 
|     3 # found in the LICENSE file. |     3 # found in the LICENSE file. | 
|     4  |     4  | 
|     5 # IMPORTANT: |     5 # IMPORTANT: | 
|     6 # Please don't directly include this file if you are building via gyp_chromium, |     6 # Please don't directly include this file if you are building via gyp_chromium, | 
|     7 # since gyp_chromium is automatically forcing its inclusion. |     7 # since gyp_chromium is automatically forcing its inclusion. | 
|     8 { |     8 { | 
|     9   # Variables expected to be overriden on the GYP command line (-D) or by |     9   # Variables expected to be overriden on the GYP command line (-D) or by | 
|    10   # ~/.gyp/include.gypi. |    10   # ~/.gyp/include.gypi. | 
| (...skipping 1162 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  1173         'release_valgrind_build': 1, |  1173         'release_valgrind_build': 1, | 
|  1174       }], |  1174       }], | 
|  1175     ], |  1175     ], | 
|  1176  |  1176  | 
|  1177     # List of default apps to install in new profiles.  The first list contains |  1177     # List of default apps to install in new profiles.  The first list contains | 
|  1178     # the source files as found in svn.  The second list, used only for linux, |  1178     # the source files as found in svn.  The second list, used only for linux, | 
|  1179     # contains the destination location for each of the files.  When a crx |  1179     # contains the destination location for each of the files.  When a crx | 
|  1180     # is added or removed from the list, the chrome/browser/resources/ |  1180     # is added or removed from the list, the chrome/browser/resources/ | 
|  1181     # default_apps/external_extensions.json file must also be updated. |  1181     # default_apps/external_extensions.json file must also be updated. | 
|  1182     'default_apps_list': [ |  1182     'default_apps_list': [ | 
|  1183       'browser/resources/default_apps/docs.crx', |  1183       'browser/resources/default_apps/drive.crx', | 
|  1184       'browser/resources/default_apps/external_extensions.json', |  1184       'browser/resources/default_apps/external_extensions.json', | 
|  1185       'browser/resources/default_apps/gmail.crx', |  1185       'browser/resources/default_apps/gmail.crx', | 
|  1186       'browser/resources/default_apps/search.crx', |  1186       'browser/resources/default_apps/search.crx', | 
|  1187       'browser/resources/default_apps/youtube.crx', |  1187       'browser/resources/default_apps/youtube.crx', | 
|  1188     ], |  1188     ], | 
|  1189     'default_apps_list_linux_dest': [ |  1189     'default_apps_list_linux_dest': [ | 
|  1190       '<(PRODUCT_DIR)/default_apps/docs.crx', |  1190       '<(PRODUCT_DIR)/default_apps/drive.crx', | 
|  1191       '<(PRODUCT_DIR)/default_apps/external_extensions.json', |  1191       '<(PRODUCT_DIR)/default_apps/external_extensions.json', | 
|  1192       '<(PRODUCT_DIR)/default_apps/gmail.crx', |  1192       '<(PRODUCT_DIR)/default_apps/gmail.crx', | 
|  1193       '<(PRODUCT_DIR)/default_apps/search.crx', |  1193       '<(PRODUCT_DIR)/default_apps/search.crx', | 
|  1194       '<(PRODUCT_DIR)/default_apps/youtube.crx', |  1194       '<(PRODUCT_DIR)/default_apps/youtube.crx', | 
|  1195     ], |  1195     ], | 
|  1196   }, |  1196   }, | 
|  1197   'target_defaults': { |  1197   'target_defaults': { | 
|  1198     'variables': { |  1198     'variables': { | 
|  1199       # The condition that operates on chromium_code is in a target_conditions |  1199       # The condition that operates on chromium_code is in a target_conditions | 
|  1200       # section, and will not have access to the default fallback value of |  1200       # section, and will not have access to the default fallback value of | 
| (...skipping 1935 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  3136     # settings in target dicts.  SYMROOT is a special case, because many other |  3136     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  3137     # Xcode variables depend on it, including variables such as |  3137     # Xcode variables depend on it, including variables such as | 
|  3138     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  3138     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  3139     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  3139     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  3140     # files to appear (when present) in the UI as actual files and not red |  3140     # files to appear (when present) in the UI as actual files and not red | 
|  3141     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  3141     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  3142     # and therefore SYMROOT, needs to be set at the project level. |  3142     # and therefore SYMROOT, needs to be set at the project level. | 
|  3143     'SYMROOT': '<(DEPTH)/xcodebuild', |  3143     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  3144   }, |  3144   }, | 
|  3145 } |  3145 } | 
| OLD | NEW |