diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 18:42:00 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 18:42:00 +0000 |
| commit | 27b1d062fcc3a12fda87c6dddf43237ed9159ca5 (patch) | |
| tree | 2295dee443e148628a1203b0c7c9a1cd7cc4f0ed | |
| parent | 06a45ebb1b65edfb84f96450ff34e4bac9fd550f (diff) | |
| download | chromium_src-27b1d062fcc3a12fda87c6dddf43237ed9159ca5.zip chromium_src-27b1d062fcc3a12fda87c6dddf43237ed9159ca5.tar.gz chromium_src-27b1d062fcc3a12fda87c6dddf43237ed9159ca5.tar.bz2 | |
Remove rendundant use of product_name in gyp files.
We default to using the target name as the product name;
there's no need to state it twice.
Review URL: http://codereview.chromium.org/7135006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88556 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_exe.gypi | 20 | ||||
| -rw-r--r-- | net/third_party/nss/ssl.gyp | 1 | ||||
| -rw-r--r-- | ppapi/ppapi_tests.gypi | 2 | ||||
| -rw-r--r-- | third_party/iccjpeg/iccjpeg.gyp | 1 | ||||
| -rw-r--r-- | third_party/qcms/qcms.gyp | 1 |
5 files changed, 8 insertions, 17 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 547d7bd..d336894 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -420,18 +420,14 @@ }], ['OS != "mac"', { 'conditions': [ - ['branding=="Chrome"', { - 'product_name': 'chrome' - }, { # else: Branding!="Chrome" - # TODO: change to: - # 'product_name': 'chromium' - # whenever we convert the rest of the infrastructure - # (buildbots etc.) to use "gyp -Dbranding=Chrome". - # NOTE: chrome/app/theme/chromium/BRANDING and - # chrome/app/theme/google_chrome/BRANDING have the short names, - # etc.; should we try to extract from there instead? - 'product_name': 'chrome' - }], + # TODO: add a: + # 'product_name': 'chromium' + # whenever we convert the rest of the infrastructure + # (buildbots etc.) to understand the branding gyp define. + # NOTE: chrome/app/theme/chromium/BRANDING and + # chrome/app/theme/google_chrome/BRANDING have the short name + # "chrome" etc.; should we try to extract from there instead? + # On Mac, this is done in chrome_dll.gypi. ['internal_pdf', { 'dependencies': [ diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp index bb8eabe..5495ef1 100644 --- a/net/third_party/nss/ssl.gyp +++ b/net/third_party/nss/ssl.gyp @@ -22,7 +22,6 @@ 'targets': [ { 'target_name': 'ssl', - 'product_name': 'ssl', 'type': 'static_library', 'sources': [ 'ssl/authcert.c', diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi index 99b6089..18d3b79 100644 --- a/ppapi/ppapi_tests.gypi +++ b/ppapi/ppapi_tests.gypi @@ -17,7 +17,6 @@ ], 'conditions': [ ['OS=="win"', { - 'product_name': 'ppapi_example', 'type': 'shared_library', 'msvs_guid': 'EE00E36E-9E8C-4DFB-925E-FBE32CEDB91B', 'sources': [ @@ -32,7 +31,6 @@ }, }], ['os_posix == 1 and OS != "mac"', { - 'product_name': 'ppapi_example', 'type': 'shared_library', 'cflags': ['-fvisibility=hidden'], # -gstabs, used in the official builds, causes an ICE. Simply remove diff --git a/third_party/iccjpeg/iccjpeg.gyp b/third_party/iccjpeg/iccjpeg.gyp index d27af1d..f3c6bdd 100644 --- a/third_party/iccjpeg/iccjpeg.gyp +++ b/third_party/iccjpeg/iccjpeg.gyp @@ -6,7 +6,6 @@ 'targets': [ { 'target_name': 'iccjpeg', - 'product_name': 'iccjpeg', 'type': 'static_library', 'dependencies': [ '<(libjpeg_gyp_path):libjpeg', diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp index 3df4bdc..dc4f5ff 100644 --- a/third_party/qcms/qcms.gyp +++ b/third_party/qcms/qcms.gyp @@ -6,7 +6,6 @@ 'targets': [ { 'target_name': 'qcms', - 'product_name': 'qcms', 'type': 'static_library', 'sources': [ 'qcms.h', |