| 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 { | 5 { |
| 6 'variables': { | 6 'variables': { |
| 7 'lastchange_path': '../build/util/LASTCHANGE', | 7 'lastchange_path': '../build/util/LASTCHANGE', |
| 8 # 'branding_dir' is set in the 'conditions' section at the bottom. | 8 # 'branding_dir' is set in the 'conditions' section at the bottom. |
| 9 }, | 9 }, |
| 10 'conditions': [ | 10 'conditions': [ |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 '../content/content.gyp:content_common', | 81 '../content/content.gyp:content_common', |
| 82 '../testing/gmock.gyp:gmock', | 82 '../testing/gmock.gyp:gmock', |
| 83 '../testing/gtest.gyp:gtest', | 83 '../testing/gtest.gyp:gtest', |
| 84 ], | 84 ], |
| 85 'include_dirs': [ | 85 'include_dirs': [ |
| 86 '..', | 86 '..', |
| 87 ], | 87 ], |
| 88 'sources': [ | 88 'sources': [ |
| 89 'installer/setup/compat_checks_unittest.cc', | 89 'installer/setup/compat_checks_unittest.cc', |
| 90 'installer/setup/setup_constants.cc', | 90 'installer/setup/setup_constants.cc', |
| 91 'installer/util/browser_distribution_unittest.cc', | |
| 92 'installer/util/channel_info_unittest.cc', | 91 'installer/util/channel_info_unittest.cc', |
| 93 'installer/util/copy_reg_key_work_item_unittest.cc', | 92 'installer/util/copy_reg_key_work_item_unittest.cc', |
| 94 'installer/util/copy_tree_work_item_unittest.cc', | 93 'installer/util/copy_tree_work_item_unittest.cc', |
| 95 'installer/util/create_dir_work_item_unittest.cc', | 94 'installer/util/create_dir_work_item_unittest.cc', |
| 96 'installer/util/create_reg_key_work_item_unittest.cc', | 95 'installer/util/create_reg_key_work_item_unittest.cc', |
| 97 'installer/util/delete_after_reboot_helper_unittest.cc', | 96 'installer/util/delete_after_reboot_helper_unittest.cc', |
| 98 'installer/util/delete_reg_key_work_item_unittest.cc', | 97 'installer/util/delete_reg_key_work_item_unittest.cc', |
| 99 'installer/util/delete_reg_value_work_item_unittest.cc', | 98 'installer/util/delete_reg_value_work_item_unittest.cc', |
| 100 'installer/util/delete_tree_work_item_unittest.cc', | 99 'installer/util/delete_tree_work_item_unittest.cc', |
| 101 'installer/util/duplicate_tree_detector_unittest.cc', | 100 'installer/util/duplicate_tree_detector_unittest.cc', |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 }, | 254 }, |
| 256 }, | 255 }, |
| 257 { | 256 { |
| 258 'target_name': 'setup', | 257 'target_name': 'setup', |
| 259 'type': 'executable', | 258 'type': 'executable', |
| 260 'dependencies': [ | 259 'dependencies': [ |
| 261 'installer_util', | 260 'installer_util', |
| 262 'installer_util_strings', | 261 'installer_util_strings', |
| 263 '../base/base.gyp:base', | 262 '../base/base.gyp:base', |
| 264 '../build/temp_gyp/googleurl.gyp:googleurl', | 263 '../build/temp_gyp/googleurl.gyp:googleurl', |
| 264 '../chrome/chrome.gyp:common_constants', |
| 265 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', | 265 '../chrome_frame/chrome_frame.gyp:chrome_tab_idl', |
| 266 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 266 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 267 '../breakpad/breakpad.gyp:breakpad_handler', | 267 '../breakpad/breakpad.gyp:breakpad_handler', |
| 268 '../rlz/rlz.gyp:rlz_lib', | 268 '../rlz/rlz.gyp:rlz_lib', |
| 269 '../third_party/zlib/zlib.gyp:zlib', | 269 '../third_party/zlib/zlib.gyp:zlib', |
| 270 ], | 270 ], |
| 271 'include_dirs': [ | 271 'include_dirs': [ |
| 272 '..', | 272 '..', |
| 273 '<(INTERMEDIATE_DIR)', | 273 '<(INTERMEDIATE_DIR)', |
| 274 '<(SHARED_INTERMEDIATE_DIR)/setup', | 274 '<(SHARED_INTERMEDIATE_DIR)/setup', |
| (...skipping 698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 973 '<(mac_packaging_sh_dir)', | 973 '<(mac_packaging_sh_dir)', |
| 974 '<(mac_product_name)', | 974 '<(mac_product_name)', |
| 975 '<(version_full)', | 975 '<(version_full)', |
| 976 ], | 976 ], |
| 977 }, | 977 }, |
| 978 ], # actions | 978 ], # actions |
| 979 }], # buildtype=="Official" | 979 }], # buildtype=="Official" |
| 980 ['branding=="Chrome" and buildtype=="Official"', { | 980 ['branding=="Chrome" and buildtype=="Official"', { |
| 981 'actions': [ | 981 'actions': [ |
| 982 { | 982 { |
| 983 » » # copy_keychain_reauthorize.sh explains why this isn't in a | 983 # copy_keychain_reauthorize.sh explains why this isn't in a |
| 984 » » # 'copies' block, but briefly: this is a prebuilt signed | 984 # 'copies' block, but briefly: this is a prebuilt signed |
| 985 » » # binary component that relies on a correct signature to | 985 # binary component that relies on a correct signature to |
| 986 » » # function properly, and a normal 'copies' block sadly makes | 986 # function properly, and a normal 'copies' block sadly makes |
| 987 » » # a trivial modification to the file such that its signature | 987 # a trivial modification to the file such that its signature |
| 988 » » # is no longer valid. | 988 # is no longer valid. |
| 989 'action_name': 'Copy keychain_reauthorize', | 989 'action_name': 'Copy keychain_reauthorize', |
| 990 'variables': { | 990 'variables': { |
| 991 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_
reauthorize.sh', | 991 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_
reauthorize.sh', |
| 992 'keychain_reauthorize_normal_path': 'installer/mac/internal/
keychain_reauthorize/com.google.Chrome', | 992 'keychain_reauthorize_normal_path': 'installer/mac/internal/
keychain_reauthorize/com.google.Chrome', |
| 993 'keychain_reauthorize_canary_path': 'installer/mac/internal/
keychain_reauthorize/com.google.Chrome.canary', | 993 'keychain_reauthorize_canary_path': 'installer/mac/internal/
keychain_reauthorize/com.google.Chrome.canary', |
| 994 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.ke
ychain_reauthorize', | 994 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.ke
ychain_reauthorize', |
| 995 }, | 995 }, |
| 996 'inputs': [ | 996 'inputs': [ |
| 997 '<(keychain_reauthorize_path)', | 997 '<(keychain_reauthorize_path)', |
| 998 '<(keychain_reauthorize_normal_path)', | 998 '<(keychain_reauthorize_normal_path)', |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1093 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | 1093 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', |
| 1094 }, | 1094 }, |
| 1095 }, { # else branding!="Chrome" | 1095 }, { # else branding!="Chrome" |
| 1096 'variables': { | 1096 'variables': { |
| 1097 'branding_dir': 'app/theme/chromium', | 1097 'branding_dir': 'app/theme/chromium', |
| 1098 'branding_dir_100': 'app/theme/default_100_percent/chromium', | 1098 'branding_dir_100': 'app/theme/default_100_percent/chromium', |
| 1099 }, | 1099 }, |
| 1100 }], | 1100 }], |
| 1101 ], | 1101 ], |
| 1102 } | 1102 } |
| OLD | NEW |