diff options
| -rw-r--r-- | build/common.gypi | 6 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 16 |
2 files changed, 22 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 diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 87df868..81778ba 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -573,6 +573,22 @@ 'glue/webworkerclient_impl.h', 'glue/window_open_disposition.h', 'glue/window_open_disposition.cc', + + # These files used to be built in the webcore target, but moved here + # since part of glue. + 'extensions/v8/gc_extension.cc', + 'extensions/v8/gc_extension.h', + 'extensions/v8/gears_extension.cc', + 'extensions/v8/gears_extension.h', + 'extensions/v8/interval_extension.cc', + 'extensions/v8/interval_extension.h', + 'extensions/v8/playback_extension.cc', + 'extensions/v8/playback_extension.h', + 'extensions/v8/profiler_extension.cc', + 'extensions/v8/profiler_extension.h', + 'extensions/v8/benchmarking_extension.cc', + 'extensions/v8/benchmarking_extension.h', + ], # When glue is a dependency, it needs to be a hard dependency. # Dependents may rely on files generated by this target or one of its |