Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Side by Side Diff: chrome/chrome_installer.gypi

Issue 183713003: Remove keychain_reauthorize (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 'libpeer_target_type%': 'static_library', 8 'libpeer_target_type%': 'static_library',
9 # 'branding_dir' is set in the 'conditions' section at the bottom. 9 # 'branding_dir' is set in the 'conditions' section at the bottom.
10 }, 10 },
(...skipping 1075 matching lines...) Expand 10 before | Expand all | Expand 10 after
1086 ], 1086 ],
1087 'action': [ 1087 'action': [
1088 '<(make_signers_sh_path)', 1088 '<(make_signers_sh_path)',
1089 '<(mac_packaging_sh_dir)', 1089 '<(mac_packaging_sh_dir)',
1090 '<(mac_product_name)', 1090 '<(mac_product_name)',
1091 '<(version_full)', 1091 '<(version_full)',
1092 ], 1092 ],
1093 }, 1093 },
1094 ], # actions 1094 ], # actions
1095 }], # buildtype=="Official" 1095 }], # buildtype=="Official"
1096 ['branding=="Chrome" and buildtype=="Official"', {
1097 'actions': [
1098 {
1099 # copy_keychain_reauthorize.sh explains why this isn't in a
1100 # 'copies' block, but briefly: this is a prebuilt signed
1101 # binary component that relies on a correct signature to
1102 # function properly, and a normal 'copies' block sadly makes
1103 # a trivial modification to the file such that its signature
1104 # is no longer valid.
1105 'action_name': 'Copy keychain_reauthorize',
1106 'variables': {
1107 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_ reauthorize.sh',
1108 'keychain_reauthorize_normal_path': 'installer/mac/internal/ keychain_reauthorize/com.google.Chrome',
1109 'keychain_reauthorize_canary_path': 'installer/mac/internal/ keychain_reauthorize/com.google.Chrome.canary',
1110 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.ke ychain_reauthorize',
1111 },
1112 'inputs': [
1113 '<(keychain_reauthorize_path)',
1114 '<(keychain_reauthorize_normal_path)',
1115 '<(keychain_reauthorize_canary_path)',
1116 ],
1117 'outputs': [
1118 '<(keychain_reauthorize_output_dir)/com.google.Chrome',
1119 '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary ',
1120 ],
1121 'action': [
1122 '<(keychain_reauthorize_path)',
1123 '<(keychain_reauthorize_output_dir)',
1124 '<(keychain_reauthorize_normal_path)',
1125 '<(keychain_reauthorize_canary_path)',
1126 ],
1127 },
1128 ], # actions
1129 }], # branding=="Chrome" and buildtype=="Official"
1130 ], # conditions 1096 ], # conditions
1131 'copies': [ 1097 'copies': [
1132 { 1098 {
1133 # Put the files where the packaging system will find them. The 1099 # Put the files where the packaging system will find them. The
1134 # packager will use these when building the "full installer" 1100 # packager will use these when building the "full installer"
1135 # disk images and delta/differential update disk images. 1101 # disk images and delta/differential update disk images.
1136 'destination': '<(mac_packaging_dir)', 1102 'destination': '<(mac_packaging_dir)',
1137 'files': [ 1103 'files': [
1138 '<(PRODUCT_DIR)/goobsdiff', 1104 '<(PRODUCT_DIR)/goobsdiff',
1139 '<(PRODUCT_DIR)/goobspatch', 1105 '<(PRODUCT_DIR)/goobspatch',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
1209 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', 1175 'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
1210 }, 1176 },
1211 }, { # else branding!="Chrome" 1177 }, { # else branding!="Chrome"
1212 'variables': { 1178 'variables': {
1213 'branding_dir': 'app/theme/chromium', 1179 'branding_dir': 'app/theme/chromium',
1214 'branding_dir_100': 'app/theme/default_100_percent/chromium', 1180 'branding_dir_100': 'app/theme/default_100_percent/chromium',
1215 }, 1181 },
1216 }], 1182 }],
1217 ], 1183 ],
1218 } 1184 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698