summaryrefslogtreecommitdiffstats
path: root/chrome/tools
diff options
context:
space:
mode:
authormmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 17:20:58 +0000
committermmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-26 17:20:58 +0000
commitfd16bc4403fd4b4949fbbe8adfda36c8c01c017d (patch)
treee3a542dd4bb2ab3d8aaa50cca6dd3ea15ed508ec /chrome/tools
parent041cc293663c538ab5ae27c87dcb1aa0785318e2 (diff)
downloadchromium_src-fd16bc4403fd4b4949fbbe8adfda36c8c01c017d.zip
chromium_src-fd16bc4403fd4b4949fbbe8adfda36c8c01c017d.tar.gz
chromium_src-fd16bc4403fd4b4949fbbe8adfda36c8c01c017d.tar.bz2
Add 'arch' field to Mac files list for consistency on all platforms.
TEST=Fix Mac official build staging step. Review URL: http://codereview.chromium.org/7753039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98437 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools')
-rw-r--r--chrome/tools/build/mac/FILES.cfg15
1 files changed, 12 insertions, 3 deletions
diff --git a/chrome/tools/build/mac/FILES.cfg b/chrome/tools/build/mac/FILES.cfg
index 8a09559..535a096 100644
--- a/chrome/tools/build/mac/FILES.cfg
+++ b/chrome/tools/build/mac/FILES.cfg
@@ -9,27 +9,36 @@
# processed by the stage/archive scripts. The known tags are:
#
# filename: Name of the file in the build output directory.
+# arch: List of CPU architectures for which this file should be processed
+# (values are based on the strings returned by python's
+# platform.architecture() function).
+# Note: Mac doesn't really care about 'arch' (like Linux does)
+# because binaries are packaged to support multiple architectures,
+# but we still tag the files to allow consistent handling in the
+# buildbot scripts. Tagging them all as both 32bit and 64bit is the
+# safest bet.
# buildtype: List of build types for which this file should be processed.
-#
-# Note, Mac doesn't tag FILES with 'arch' (like Linux does) because binaries
-# are packaged to support multiple architectures.
FILES = [
{
'filename': 'Chromium.app',
+ 'arch': ['32bit', '64bit'],
'buildtype': ['dev'],
},
{
'filename': 'Google Chrome.app',
+ 'arch': ['32bit', '64bit'],
'buildtype': ['official'],
},
{
'filename': 'Google Chrome Packaging',
+ 'arch': ['32bit', '64bit'],
'buildtype': ['official'],
},
# Remoting Host plugin files:
{
'filename': 'remoting_host_plugin.plugin',
+ 'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
]