diff options
| author | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 23:56:55 +0000 |
|---|---|---|
| committer | tschmelcher@chromium.org <tschmelcher@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-12 23:56:55 +0000 |
| commit | a1deefe8c869a7944c0419091ec45620af9b515c (patch) | |
| tree | cf185db1e9d95d542c42049bb713a65d025e0734 /o3d/installer | |
| parent | 515c71659b320d501ca37fa7a3a39b2cf3a6d6f8 (diff) | |
| download | chromium_src-a1deefe8c869a7944c0419091ec45620af9b515c.zip chromium_src-a1deefe8c869a7944c0419091ec45620af9b515c.tar.gz chromium_src-a1deefe8c869a7944c0419091ec45620af9b515c.tar.bz2 | |
Parameterize the name of the "O3DExtras" directory with a GYP variable (to allow side-by-side installs of differently-branded builds that both include the extras directory).
Also move the branding.gypi and version.gypi files from plugin/ to build/, which is a more sensible location.
Also delete an extraneous definition of plugin_enable_fullscreen_msg from core.gyp (it's already in common.gypi).
TEST=built on Windows, both with and without plugin_extras_directory specified
BUG=none
Review URL: http://codereview.chromium.org/2893011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52153 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/installer')
| -rw-r--r-- | o3d/installer/installer.gyp | 2 | ||||
| -rw-r--r-- | o3d/installer/linux/debian.in/debian.gyp | 2 | ||||
| -rw-r--r-- | o3d/installer/mac/installer.gyp | 2 | ||||
| -rw-r--r-- | o3d/installer/win/installer.gyp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/o3d/installer/installer.gyp b/o3d/installer/installer.gyp index 4361d65..dba0f4d 100644 --- a/o3d/installer/installer.gyp +++ b/o3d/installer/installer.gyp @@ -7,8 +7,8 @@ 'chromium_code': 1, }, 'includes': [ + '../build/branding.gypi', '../build/common.gypi', - '../plugin/branding.gypi', ], 'targets': [ { diff --git a/o3d/installer/linux/debian.in/debian.gyp b/o3d/installer/linux/debian.in/debian.gyp index 614e311..63846ac 100644 --- a/o3d/installer/linux/debian.in/debian.gyp +++ b/o3d/installer/linux/debian.in/debian.gyp @@ -5,7 +5,7 @@ { 'includes': [ '../../../build/common.gypi', - '../../../plugin/version.gypi', + '../../../build/version.gypi', ], 'variables': { 'INSTALLER_DIR': '<(PRODUCT_DIR)/installer', diff --git a/o3d/installer/mac/installer.gyp b/o3d/installer/mac/installer.gyp index 7e41527..7ff46bf 100644 --- a/o3d/installer/mac/installer.gyp +++ b/o3d/installer/mac/installer.gyp @@ -8,7 +8,7 @@ }, 'includes': [ '../../build/common.gypi', - '../../plugin/version.gypi', + '../../build/version.gypi', ], 'targets': [ { diff --git a/o3d/installer/win/installer.gyp b/o3d/installer/win/installer.gyp index 9246aa7..0f100d3 100644 --- a/o3d/installer/win/installer.gyp +++ b/o3d/installer/win/installer.gyp @@ -34,7 +34,7 @@ }, 'includes': [ '../../build/common.gypi', - '../../plugin/version.gypi', + '../../build/version.gypi', ], 'targets': [ { |