From 0faab517e5d541bc51d24be919e899991ed7356a Mon Sep 17 00:00:00 2001
From: "mmoss@chromium.org"
 <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 25 Aug 2009 00:12:29 +0000
Subject: Update build to work with native 64-bit Linux packages.

Also remove the no longer used GTK variable, since the GTK_PATH modification
was a hack for 32-bit binaries on 64-bit distros.

Review URL: http://codereview.chromium.org/173286


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24186 0039d316-1c4b-4281-b951-d872f2087c98
---
 .../browser/gtk/options/advanced_contents_gtk.cc   |   4 +-
 chrome/common/platform_util_linux.cc               |   1 -
 chrome/installer/installer.gyp                     | 110 +++++++++++----------
 3 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/chrome/browser/gtk/options/advanced_contents_gtk.cc b/chrome/browser/gtk/options/advanced_contents_gtk.cc
index f6b6568..c50e77c 100644
--- a/chrome/browser/gtk/options/advanced_contents_gtk.cc
+++ b/chrome/browser/gtk/options/advanced_contents_gtk.cc
@@ -436,10 +436,8 @@ void NetworkSection::StartProxyConfigUtil(const ProxyConfigCommand& command) {
   for (size_t i = 1; command.argv[i]; i++)
     argv.push_back(command.argv[i]);
   base::file_handle_mapping_vector no_files;
-  base::environment_vector env;
   base::ProcessHandle handle;
-  env.push_back(std::make_pair("GTK_PATH", getenv("CHROMIUM_SAVED_GTK_PATH")));
-  if (!base::LaunchApp(argv, env, no_files, false, &handle)) {
+  if (!base::LaunchApp(argv, no_files, false, &handle)) {
     LOG(ERROR) << "StartProxyConfigUtil failed to start " << command.binary;
     BrowserList::GetLastActive()->
         OpenURL(GURL(l10n_util::GetStringUTF8(IDS_LINUX_PROXY_CONFIG_URL)),
diff --git a/chrome/common/platform_util_linux.cc b/chrome/common/platform_util_linux.cc
index 4e25bcf..778e046 100644
--- a/chrome/common/platform_util_linux.cc
+++ b/chrome/common/platform_util_linux.cc
@@ -19,7 +19,6 @@ void XDGOpen(const FilePath& path) {
   argv.push_back(path.value());
 
   base::environment_vector env;
-  env.push_back(std::make_pair("GTK_PATH", getenv("CHROMIUM_SAVED_GTK_PATH")));
   // xdg-open can fall back on mailcap which eventually might plumb through
   // to a command that needs a terminal.  Set the environment variable telling
   // it that we definitely don't have a terminal available and that it should
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 373b36a..c501a59 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -385,9 +385,6 @@
           # Add these files to the build output so the build archives will be
           # "hermetic" for packaging. This is only for branding="Chrome" since
           # we only create packages for official builds.
-          'variables': {
-            'lib32_dir': '<!(if uname -m | egrep -q "x86_64"; then echo lib32; else echo lib; fi)',
-          },
           'copies': [
             # Copy tools for generating packages from the build archive.
             {
@@ -431,34 +428,6 @@
                 'linux/internal/common/wrapper',
               ]
             },
-            # System libs needed for 64-bit package building.
-            {
-              'destination': '<(PRODUCT_DIR)/installer/lib32/',
-              'files': [
-                '/usr/<(lib32_dir)/libnspr4.so',
-                '/usr/<(lib32_dir)/libnspr4.so.0d',
-                '/usr/<(lib32_dir)/libnss3.so',
-                '/usr/<(lib32_dir)/libnss3.so.1d',
-                '/usr/<(lib32_dir)/libnssutil3.so',
-                '/usr/<(lib32_dir)/libnssutil3.so.1d',
-                '/usr/<(lib32_dir)/libplc4.so',
-                '/usr/<(lib32_dir)/libplc4.so.0d',
-                '/usr/<(lib32_dir)/libplds4.so',
-                '/usr/<(lib32_dir)/libplds4.so.0d',
-                '/usr/<(lib32_dir)/libsmime3.so',
-                '/usr/<(lib32_dir)/libsmime3.so.1d',
-                '/usr/<(lib32_dir)/libsqlite3.so.0',
-                '/usr/<(lib32_dir)/libsqlite3.so.0.8.6',
-                '/usr/<(lib32_dir)/libssl3.so',
-                '/usr/<(lib32_dir)/libssl3.so.1d',
-                '/usr/<(lib32_dir)/nss/libfreebl3.chk',
-                '/usr/<(lib32_dir)/nss/libfreebl3.so',
-                '/usr/<(lib32_dir)/nss/libnssckbi.so',
-                '/usr/<(lib32_dir)/nss/libnssdbm3.so',
-                '/usr/<(lib32_dir)/nss/libsoftokn3.chk',
-                '/usr/<(lib32_dir)/nss/libsoftokn3.so',
-              ],
-            },
             # Additional theme resources needed for package building.
             {
               'destination': '<(PRODUCT_DIR)/installer/theme/',
@@ -516,6 +485,18 @@
               '<(PRODUCT_DIR)/locales/en-US.pak',
               '<(PRODUCT_DIR)/themes/default.pak',
             ],
+            # TODO(mmoss) The ffmpeg libs are currently 32-bit only. Once we
+            # have 64-bit, this will need to copy the correct versions to the
+            # build output.
+            'conditions': [
+              ['target_arch=="x64"', {
+                'input_files!': [
+                  '<(PRODUCT_DIR)/libavcodec.so.52',
+                  '<(PRODUCT_DIR)/libavformat.so.52',
+                  '<(PRODUCT_DIR)/libavutil.so.50',
+                ],
+              }],
+            ],
           },
           'actions': [
             {
@@ -525,33 +506,56 @@
                 '<(PRODUCT_DIR)/installer/debian/build.sh',
                 '<@(input_files)',
               ],
-              'outputs': [
-                '<(PRODUCT_DIR)/google-chrome-unstable_<(version)-r<(revision)_i386.deb',
-                '<(PRODUCT_DIR)/google-chrome-unstable_<(version)-r<(revision)_amd64.deb',
-                # TODO(mmoss) Add other outputs once we start building other channels.
+              'conditions': [
+                ['target_arch=="ia32"', {
+                  'outputs': [
+                    '<(PRODUCT_DIR)/google-chrome-unstable_<(version)-r<(revision)_i386.deb',
+                    # TODO(mmoss) Add other outputs once we start building
+                    # other channels.
+                  ],
+                }],
+                ['target_arch=="x64"', {
+                  'outputs': [
+                    '<(PRODUCT_DIR)/google-chrome-unstable_<(version)-r<(revision)_amd64.deb',
+                    # TODO(mmoss) Add other outputs once we start building
+                    # other channels.
+                  ],
+                }],
               ],
               'action': [
-                'bash', '<(PRODUCT_DIR)/installer/debian/build.sh', '-o'
-                '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)', '-c', 'dev',
+                'bash', '<(PRODUCT_DIR)/installer/debian/build.sh',
+                '-o' '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)',
+                '-a', '<(target_arch)', '-c', 'dev',
               ],
             },
-            {
-              'action_name': 'rpm_packages',
-              'process_outputs_as_sources': 1,
-              'inputs': [
-                '<(PRODUCT_DIR)/installer/rpm/build.sh',
-                '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
-                '<@(input_files)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/google-chrome-unstable-<(version)-<(revision).i386.rpm',
-                # TODO(mmoss) Add other outputs once we start building other channels.
-              ],
-              'action': [
-                'bash', '<(PRODUCT_DIR)/installer/rpm/build.sh', '-o'
-                '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)', '-c', 'dev',
+          ],
+          'conditions': [
+            ['target_arch=="ia32"', {
+              'actions': [
+                {
+                  'action_name': 'rpm_packages',
+                  'process_outputs_as_sources': 1,
+                  'inputs': [
+                    '<(PRODUCT_DIR)/installer/rpm/build.sh',
+                    '<(PRODUCT_DIR)/installer/rpm/chrome.spec.template',
+                    '<@(input_files)',
+                  ],
+                  'outputs': [
+                    '<(PRODUCT_DIR)/google-chrome-unstable-<(version)-<(revision).i386.rpm',
+                    # TODO(mmoss) Add other outputs once we start building
+                    # other channels.
+                  ],
+                  'action': [
+                    'bash', '<(PRODUCT_DIR)/installer/rpm/build.sh',
+                    '-o' '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)',
+                    '-a', '<(target_arch)', '-c', 'dev',
+                  ],
+                }
               ],
-            },
+            }],
+            ['target_arch=="x64"', {
+              # TODO(mmoss) 64-bit RPMs not ready yet.
+            }],
           ],
         },
       ],
-- 
cgit v1.1