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

Side by Side Diff: chrome/chrome_installer.gypi

Issue 10534113: Only copy keychain_reauthorize in official builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 6 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 | « no previous file | no next file » | 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 # '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 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
919 ], 919 ],
920 'action': [ 920 'action': [
921 '<(make_signers_sh_path)', 921 '<(make_signers_sh_path)',
922 '<(mac_packaging_sh_dir)', 922 '<(mac_packaging_sh_dir)',
923 '<(mac_product_name)', 923 '<(mac_product_name)',
924 '<(version_full)', 924 '<(version_full)',
925 ], 925 ],
926 }, 926 },
927 ], # actions 927 ], # actions
928 }], # buildtype=="Official" 928 }], # buildtype=="Official"
929 ['branding=="Chrome" and buildtype=="Official"', {
930 'actions': [
931 {
932 # copy_keychain_reauthorize.sh explains why this isn't in a
933 # 'copies' block, but briefly: this is a prebuilt signed
934 # binary component that relies on a correct signature to
935 # function properly, and a normal 'copies' block sadly makes
936 # a trivial modification to the file such that its signature
937 # is no longer valid.
938 'action_name': 'Copy keychain_reauthorize',
939 'variables': {
940 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_ reauthorize.sh',
941 'keychain_reauthorize_normal_path': 'installer/mac/internal/ keychain_reauthorize/com.google.Chrome',
942 'keychain_reauthorize_canary_path': 'installer/mac/internal/ keychain_reauthorize/com.google.Chrome.canary',
943 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.ke ychain_reauthorize',
944 },
945 'inputs': [
946 '<(keychain_reauthorize_path)',
947 '<(keychain_reauthorize_normal_path)',
948 '<(keychain_reauthorize_canary_path)',
949 ],
950 'outputs': [
951 '<(keychain_reauthorize_output_dir)/com.google.Chrome',
952 '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary ',
953 ],
954 'action': [
955 '<(keychain_reauthorize_path)',
956 '<(keychain_reauthorize_output_dir)',
957 '<(keychain_reauthorize_normal_path)',
958 '<(keychain_reauthorize_canary_path)',
959 ],
960 },
961 ], # actions
962 }], # branding=="Chrome" and buildtype=="Official"
929 ], # conditions 963 ], # conditions
930 'copies': [ 964 'copies': [
931 { 965 {
932 # Put the files where the packaging system will find them. The 966 # Put the files where the packaging system will find them. The
933 # packager will use these when building the "full installer" 967 # packager will use these when building the "full installer"
934 # disk images and delta/differential update disk images. 968 # disk images and delta/differential update disk images.
935 'destination': '<(mac_packaging_dir)', 969 'destination': '<(mac_packaging_dir)',
936 'files': [ 970 'files': [
937 '<(PRODUCT_DIR)/goobsdiff', 971 '<(PRODUCT_DIR)/goobsdiff',
938 '<(PRODUCT_DIR)/goobspatch', 972 '<(PRODUCT_DIR)/goobspatch',
(...skipping 19 matching lines...) Expand all
958 'installer/mac/internal/chrome_canary_dmg_icon.icns', 992 'installer/mac/internal/chrome_canary_dmg_icon.icns',
959 'installer/mac/internal/chrome_dmg_background.png', 993 'installer/mac/internal/chrome_dmg_background.png',
960 'installer/mac/internal/chrome_dmg_dsstore', 994 'installer/mac/internal/chrome_dmg_dsstore',
961 'installer/mac/internal/chrome_dmg_icon.icns', 995 'installer/mac/internal/chrome_dmg_icon.icns',
962 'installer/mac/internal/generate_dmgs', 996 'installer/mac/internal/generate_dmgs',
963 ], 997 ],
964 }], # branding=="Chrome" and buildtype=="Official" 998 }], # branding=="Chrome" and buildtype=="Official"
965 ], # conditions 999 ], # conditions
966 }, 1000 },
967 ], # copies 1001 ], # copies
968 'actions': [
969 {
970 # copy_keychain_reauthorize.sh explains why this isn't in a
971 # 'copies' block, but briefly: this is a prebuilt signed binary
972 # component that relies on a correct signature to function
973 # properly, and a normal 'copies' block sadly makes a trivial
974 # modification to the file such that its signature is no longer
975 # valid.
976 'action_name': 'Copy keychain_reauthorize',
977 'variables': {
978 'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reau thorize.sh',
979 'keychain_reauthorize_normal_path': 'installer/mac/internal/keyc hain_reauthorize/com.google.Chrome',
980 'keychain_reauthorize_canary_path': 'installer/mac/internal/keyc hain_reauthorize/com.google.Chrome.canary',
981 'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.keycha in_reauthorize',
982 },
983 'inputs': [
984 '<(keychain_reauthorize_path)',
985 '<(keychain_reauthorize_normal_path)',
986 '<(keychain_reauthorize_canary_path)',
987 ],
988 'outputs': [
989 '<(keychain_reauthorize_output_dir)/com.google.Chrome',
990 '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary',
991 ],
992 'action': [
993 '<(keychain_reauthorize_path)',
994 '<(keychain_reauthorize_output_dir)',
995 '<(keychain_reauthorize_normal_path)',
996 '<(keychain_reauthorize_canary_path)',
997 ],
998 },
999 ], # actions
1000 }, # target: installer_packaging 1002 }, # target: installer_packaging
1001 { 1003 {
1002 'target_name': 'gcapi_lib', 1004 'target_name': 'gcapi_lib',
1003 'type': 'static_library', 1005 'type': 'static_library',
1004 'include_dirs': [ 1006 'include_dirs': [
1005 '..', 1007 '..',
1006 ], 1008 ],
1007 'sources': [ 1009 'sources': [
1008 'installer/gcapi_mac/gcapi.h', 1010 'installer/gcapi_mac/gcapi.h',
1009 'installer/gcapi_mac/gcapi.mm', 1011 'installer/gcapi_mac/gcapi.mm',
(...skipping 28 matching lines...) Expand all
1038 'variables': { 1040 'variables': {
1039 'branding_dir': 'app/theme/google_chrome', 1041 'branding_dir': 'app/theme/google_chrome',
1040 }, 1042 },
1041 }, { # else branding!="Chrome" 1043 }, { # else branding!="Chrome"
1042 'variables': { 1044 'variables': {
1043 'branding_dir': 'app/theme/chromium', 1045 'branding_dir': 'app/theme/chromium',
1044 }, 1046 },
1045 }], 1047 }],
1046 ], 1048 ],
1047 } 1049 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698