| 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 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1273 # List of default apps to install in new profiles. The first list contains | 1273 # List of default apps to install in new profiles. The first list contains |
| 1274 # the source files as found in svn. The second list, used only for linux, | 1274 # the source files as found in svn. The second list, used only for linux, |
| 1275 # contains the destination location for each of the files. When a crx | 1275 # contains the destination location for each of the files. When a crx |
| 1276 # is added or removed from the list, the chrome/browser/resources/ | 1276 # is added or removed from the list, the chrome/browser/resources/ |
| 1277 # default_apps/external_extensions.json file must also be updated. | 1277 # default_apps/external_extensions.json file must also be updated. |
| 1278 'default_apps_list': [ | 1278 'default_apps_list': [ |
| 1279 'browser/resources/default_apps/external_extensions.json', | 1279 'browser/resources/default_apps/external_extensions.json', |
| 1280 'browser/resources/default_apps/gmail.crx', | 1280 'browser/resources/default_apps/gmail.crx', |
| 1281 'browser/resources/default_apps/search.crx', | 1281 'browser/resources/default_apps/search.crx', |
| 1282 'browser/resources/default_apps/youtube.crx', | 1282 'browser/resources/default_apps/youtube.crx', |
| 1283 'browser/resources/default_apps/drive.crx', |
| 1283 ], | 1284 ], |
| 1284 'default_apps_list_linux_dest': [ | 1285 'default_apps_list_linux_dest': [ |
| 1285 '<(PRODUCT_DIR)/default_apps/external_extensions.json', | 1286 '<(PRODUCT_DIR)/default_apps/external_extensions.json', |
| 1286 '<(PRODUCT_DIR)/default_apps/gmail.crx', | 1287 '<(PRODUCT_DIR)/default_apps/gmail.crx', |
| 1287 '<(PRODUCT_DIR)/default_apps/search.crx', | 1288 '<(PRODUCT_DIR)/default_apps/search.crx', |
| 1288 '<(PRODUCT_DIR)/default_apps/youtube.crx', | 1289 '<(PRODUCT_DIR)/default_apps/youtube.crx', |
| 1290 '<(PRODUCT_DIR)/default_apps/drive.crx', |
| 1289 ], | 1291 ], |
| 1290 }, | 1292 }, |
| 1291 'target_defaults': { | 1293 'target_defaults': { |
| 1292 'variables': { | 1294 'variables': { |
| 1293 # The condition that operates on chromium_code is in a target_conditions | 1295 # The condition that operates on chromium_code is in a target_conditions |
| 1294 # section, and will not have access to the default fallback value of | 1296 # section, and will not have access to the default fallback value of |
| 1295 # chromium_code at the top of this file, or to the chromium_code | 1297 # chromium_code at the top of this file, or to the chromium_code |
| 1296 # variable placed at the root variables scope of .gyp files, because | 1298 # variable placed at the root variables scope of .gyp files, because |
| 1297 # those variables are not set at target scope. As a workaround, | 1299 # those variables are not set at target scope. As a workaround, |
| 1298 # if chromium_code is not set at target scope, define it in target scope | 1300 # if chromium_code is not set at target scope, define it in target scope |
| (...skipping 2120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3419 # settings in target dicts. SYMROOT is a special case, because many other | 3421 # settings in target dicts. SYMROOT is a special case, because many other |
| 3420 # Xcode variables depend on it, including variables such as | 3422 # Xcode variables depend on it, including variables such as |
| 3421 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3423 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3422 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3424 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3423 # files to appear (when present) in the UI as actual files and not red | 3425 # files to appear (when present) in the UI as actual files and not red |
| 3424 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3426 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3425 # and therefore SYMROOT, needs to be set at the project level. | 3427 # and therefore SYMROOT, needs to be set at the project level. |
| 3426 'SYMROOT': '<(DEPTH)/xcodebuild', | 3428 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3427 }, | 3429 }, |
| 3428 } | 3430 } |
| OLD | NEW |