diff options
| author | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 20:36:21 +0000 |
|---|---|---|
| committer | yaar@chromium.org <yaar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-24 20:36:21 +0000 |
| commit | b2f030c9ca8976b71264657f77c71cdb6249f66c (patch) | |
| tree | 3f9bb4d984b4e98e904cbe046942102516ed8cfe /build | |
| parent | 3462401ddb4fab9efbf63d528026473ca07e8828 (diff) | |
| download | chromium_src-b2f030c9ca8976b71264657f77c71cdb6249f66c.zip chromium_src-b2f030c9ca8976b71264657f77c71cdb6249f66c.tar.gz chromium_src-b2f030c9ca8976b71264657f77c71cdb6249f66c.tar.bz2 | |
Downstreamed v8 extension building & webkit_chromium_port flag
1. Downstreamed building webkit/extension/v8/*.cc files, which were built by upstream webcore by mistake. Now glue will build them.
I tested that even though webcore still builds them, there are no errors if glue also builds them.
2. Added webkit_chromium_port variable to build/common.gypi which is turned off by default. Currently, nothing uses it but the chrome port will need it.
Review URL: http://codereview.chromium.org/220026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27122 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi index ebb6262..dfe931c 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -49,6 +49,11 @@ # Defaults to a desktop build, overridden via command line/env. 'chromeos%': 0, + + # This variable tells WebCore.gyp and JavaScriptCore.gyp whether they are + # are built under a chromium full build (1) or a webkit.org chromium + # build (0). + 'inside_chromium_build%': 1, }, # Define branding and buildtype on the basis of their settings within the @@ -58,6 +63,7 @@ 'target_arch%': '<(target_arch)', 'toolkit_views%': '<(toolkit_views)', 'chromeos%': '<(chromeos)', + 'inside_chromium_build%': '<(inside_chromium_build)', # Override chromium_mac_pch and set it to 0 to suppress the use of # precompiled headers on the Mac. Prefix header injection may still be |