diff options
| author | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 21:07:35 +0000 |
|---|---|---|
| committer | apatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-02 21:07:35 +0000 |
| commit | a79a3f8d347a8a7ad9476afd7ee60f4b69707768 (patch) | |
| tree | 257fe9e629a1f22d598cab68683226b82239547f /build | |
| parent | ab3af989e6e7ea57a07c630fc2a21f625e5ba0fc (diff) | |
| download | chromium_src-a79a3f8d347a8a7ad9476afd7ee60f4b69707768.zip chromium_src-a79a3f8d347a8a7ad9476afd7ee60f4b69707768.tar.gz chromium_src-a79a3f8d347a8a7ad9476afd7ee60f4b69707768.tar.bz2 | |
Conditionally added pepper_test_plugin.gyp as all.gyp dependency based on whether enable_pepper variable is set to 1. Defaults to 0.
Added run_as block to automatically launch chrome and load the plugin when the pepper_test_plugin project is run or debugged.
See new instructions in updated README.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/343070
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 5 | ||||
| -rw-r--r-- | build/common.gypi | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index bf37324..94cca3d 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -49,6 +49,11 @@ '../chrome_frame/chrome_frame.gyp:*', ], }], + ['enable_pepper==1', { + 'dependencies': [ + '../webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp:*', + ], + }], ['OS=="mac"', { 'dependencies': [ '../third_party/ocmock/ocmock.gyp:*', diff --git a/build/common.gypi b/build/common.gypi index e90321b..05c8de9d 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -135,6 +135,9 @@ # Whether to add the experimental build define. 'chrome_frame_define%': 0, + # Whether pepper APIs are enabled. + 'enable_pepper%': 0, + # TODO(bradnelson): eliminate this when possible. # To allow local gyp files to prevent release.vsprops from being included. # Yes(1) means include release.vsprops. @@ -286,6 +289,9 @@ ['chromeos==1 or toolkit_views==1', { 'defines': ['OS_CHROMEOS=1'], }], + ['enable_pepper==1', { + 'defines': ['ENABLE_PEPPER=1'], + }], ['fastbuild!=0', { 'conditions': [ # Finally, for Windows, we simply turn on profiling. |