| 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 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1052 'browser/resources/default_apps/gmail.crx', | 1052 'browser/resources/default_apps/gmail.crx', |
| 1053 'browser/resources/default_apps/search.crx', | 1053 'browser/resources/default_apps/search.crx', |
| 1054 'browser/resources/default_apps/youtube.crx', | 1054 'browser/resources/default_apps/youtube.crx', |
| 1055 ], | 1055 ], |
| 1056 'default_apps_list_linux_dest': [ | 1056 'default_apps_list_linux_dest': [ |
| 1057 '<(PRODUCT_DIR)/default_apps/external_extensions.json', | 1057 '<(PRODUCT_DIR)/default_apps/external_extensions.json', |
| 1058 '<(PRODUCT_DIR)/default_apps/gmail.crx', | 1058 '<(PRODUCT_DIR)/default_apps/gmail.crx', |
| 1059 '<(PRODUCT_DIR)/default_apps/search.crx', | 1059 '<(PRODUCT_DIR)/default_apps/search.crx', |
| 1060 '<(PRODUCT_DIR)/default_apps/youtube.crx', | 1060 '<(PRODUCT_DIR)/default_apps/youtube.crx', |
| 1061 ], | 1061 ], |
| 1062 |
| 1063 # Force rlz to use chrome's networking stack. |
| 1064 'rlz_use_chrome_net%': 1, |
| 1062 }, | 1065 }, |
| 1063 'target_defaults': { | 1066 'target_defaults': { |
| 1064 'variables': { | 1067 'variables': { |
| 1065 # The condition that operates on chromium_code is in a target_conditions | 1068 # The condition that operates on chromium_code is in a target_conditions |
| 1066 # section, and will not have access to the default fallback value of | 1069 # section, and will not have access to the default fallback value of |
| 1067 # chromium_code at the top of this file, or to the chromium_code | 1070 # chromium_code at the top of this file, or to the chromium_code |
| 1068 # variable placed at the root variables scope of .gyp files, because | 1071 # variable placed at the root variables scope of .gyp files, because |
| 1069 # those variables are not set at target scope. As a workaround, | 1072 # those variables are not set at target scope. As a workaround, |
| 1070 # if chromium_code is not set at target scope, define it in target scope | 1073 # if chromium_code is not set at target scope, define it in target scope |
| 1071 # to contain whatever value it has during early variable expansion. | 1074 # to contain whatever value it has during early variable expansion. |
| (...skipping 1871 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2943 # settings in target dicts. SYMROOT is a special case, because many other | 2946 # settings in target dicts. SYMROOT is a special case, because many other |
| 2944 # Xcode variables depend on it, including variables such as | 2947 # Xcode variables depend on it, including variables such as |
| 2945 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2948 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2946 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2949 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2947 # files to appear (when present) in the UI as actual files and not red | 2950 # files to appear (when present) in the UI as actual files and not red |
| 2948 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2951 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2949 # and therefore SYMROOT, needs to be set at the project level. | 2952 # and therefore SYMROOT, needs to be set at the project level. |
| 2950 'SYMROOT': '<(DEPTH)/xcodebuild', | 2953 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2951 }, | 2954 }, |
| 2952 } | 2955 } |
| OLD | NEW |