From 73661f60b5e1eb10c6889f2ba0692166bcf83269 Mon Sep 17 00:00:00 2001
From: "tschmelcher@chromium.org"
 <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Mon, 22 Feb 2010 21:12:16 +0000
Subject: Make ActiveX CLSIDs and names into overridable variables too. Also
 make the NPAPI plugin's filename overridable, since that's needed too in
 order to fully re-brand the NPAPI plugin.

TEST=built on Windows with branding overrides and verified that the product worked in both FF 3.6 and IE7 with similarly modified JavaScript code
BUG=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39630 0039d316-1c4b-4281-b951-d872f2087c98
---
 o3d/installer/installer.gyp | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

(limited to 'o3d/installer/installer.gyp')

diff --git a/o3d/installer/installer.gyp b/o3d/installer/installer.gyp
index afbd0fd..4361d65 100644
--- a/o3d/installer/installer.gyp
+++ b/o3d/installer/installer.gyp
@@ -8,33 +8,44 @@
   },
   'includes': [
     '../build/common.gypi',
+    '../plugin/branding.gypi',
   ],
   'targets': [
     {
       'target_name': 'installer',
       'type': 'none',
       'conditions': [
-        ['OS=="win"',
+        # We suppress building the installers for third parties using custom
+        # branding, because they contain a lot of hard-coded logic that assumes
+        # the official branding. A rebranded build must instead be shipped
+        # as part of some third-party's own installer.
+        ['<(plugin_rebranded) == 0',
           {
-            'dependencies': [
-              'win/installer.gyp:installer',
-              'win/installer.gyp:extras_installer',
+          'conditions': [
+            ['OS=="win"',
+              {
+                'dependencies': [
+                  'win/installer.gyp:installer',
+                  'win/installer.gyp:extras_installer',
+                ],
+              },
             ],
-          },
-        ],
-        ['OS=="mac"',
-          {
-            'dependencies': [
-              'mac/installer.gyp:disk_image',
+            ['OS=="mac"',
+              {
+                'dependencies': [
+                  'mac/installer.gyp:disk_image',
+                ],
+              },
             ],
-          },
-        ],
-        ['OS=="linux"',
-          {
-            'dependencies': [
-              'linux/installer.gyp:installer',
+            ['OS=="linux"',
+              {
+                'dependencies': [
+                  'linux/installer.gyp:installer',
+                ],
+              },
             ],
-          },
+          ],
+          }
         ],
       ],
     },
-- 
cgit v1.1