| 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 1188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1199 'release_valgrind_build': 1, | 1199 'release_valgrind_build': 1, |
| 1200 }], | 1200 }], |
| 1201 ], | 1201 ], |
| 1202 | 1202 |
| 1203 # List of default apps to install in new profiles. The first list contains | 1203 # List of default apps to install in new profiles. The first list contains |
| 1204 # the source files as found in svn. The second list, used only for linux, | 1204 # the source files as found in svn. The second list, used only for linux, |
| 1205 # contains the destination location for each of the files. When a crx | 1205 # contains the destination location for each of the files. When a crx |
| 1206 # is added or removed from the list, the chrome/browser/resources/ | 1206 # is added or removed from the list, the chrome/browser/resources/ |
| 1207 # default_apps/external_extensions.json file must also be updated. | 1207 # default_apps/external_extensions.json file must also be updated. |
| 1208 'default_apps_list': [ | 1208 'default_apps_list': [ |
| 1209 'browser/resources/default_apps/drive.crx', | |
| 1210 'browser/resources/default_apps/external_extensions.json', | 1209 'browser/resources/default_apps/external_extensions.json', |
| 1211 'browser/resources/default_apps/gmail.crx', | 1210 'browser/resources/default_apps/gmail.crx', |
| 1212 'browser/resources/default_apps/search.crx', | 1211 'browser/resources/default_apps/search.crx', |
| 1213 'browser/resources/default_apps/youtube.crx', | 1212 'browser/resources/default_apps/youtube.crx', |
| 1214 ], | 1213 ], |
| 1215 'default_apps_list_linux_dest': [ | 1214 'default_apps_list_linux_dest': [ |
| 1216 '<(PRODUCT_DIR)/default_apps/drive.crx', | |
| 1217 '<(PRODUCT_DIR)/default_apps/external_extensions.json', | 1215 '<(PRODUCT_DIR)/default_apps/external_extensions.json', |
| 1218 '<(PRODUCT_DIR)/default_apps/gmail.crx', | 1216 '<(PRODUCT_DIR)/default_apps/gmail.crx', |
| 1219 '<(PRODUCT_DIR)/default_apps/search.crx', | 1217 '<(PRODUCT_DIR)/default_apps/search.crx', |
| 1220 '<(PRODUCT_DIR)/default_apps/youtube.crx', | 1218 '<(PRODUCT_DIR)/default_apps/youtube.crx', |
| 1221 ], | 1219 ], |
| 1222 }, | 1220 }, |
| 1223 'target_defaults': { | 1221 'target_defaults': { |
| 1224 'variables': { | 1222 'variables': { |
| 1225 # The condition that operates on chromium_code is in a target_conditions | 1223 # The condition that operates on chromium_code is in a target_conditions |
| 1226 # section, and will not have access to the default fallback value of | 1224 # section, and will not have access to the default fallback value of |
| (...skipping 2063 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3290 # settings in target dicts. SYMROOT is a special case, because many other | 3288 # settings in target dicts. SYMROOT is a special case, because many other |
| 3291 # Xcode variables depend on it, including variables such as | 3289 # Xcode variables depend on it, including variables such as |
| 3292 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3290 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3293 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3291 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3294 # files to appear (when present) in the UI as actual files and not red | 3292 # files to appear (when present) in the UI as actual files and not red |
| 3295 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3293 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3296 # and therefore SYMROOT, needs to be set at the project level. | 3294 # and therefore SYMROOT, needs to be set at the project level. |
| 3297 'SYMROOT': '<(DEPTH)/xcodebuild', | 3295 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3298 }, | 3296 }, |
| 3299 } | 3297 } |
| OLD | NEW |