Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(438)

Unified Diff: Source/build/scripts.gypi

Issue 26763006: Move the generation and inclusion of RuntimeEnabledFeatures to blink_platform.dll since many pieces… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink@master
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/build/scripts.gypi
diff --git a/Source/modules/modules.gyp b/Source/build/scripts.gypi
similarity index 68%
copy from Source/modules/modules.gyp
copy to Source/build/scripts.gypi
index f00ee867dc8caf102574eff89a6a3fe490260745..2c10eb4b396bb75708585efa365f3817d671c400 100644
--- a/Source/modules/modules.gyp
+++ b/Source/build/scripts.gypi
@@ -1,5 +1,5 @@
#
-# Copyright (C) 2013 Google Inc. All rights reserved.
+# Copyright (C) 2013 Samsung Electronics. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are
@@ -27,28 +27,22 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+
{
- 'includes': [
- '../build/win/precompile.gypi',
- 'modules.gypi',
- ],
- 'targets': [{
- 'target_name': 'modules',
- 'type': 'static_library',
- 'dependencies': [
- '<(DEPTH)/third_party/zlib/zlib.gyp:zlib',
- '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
- '../config.gyp:config',
- '../core/core.gyp:webcore',
+ 'variables': {
+ 'scripts_for_in_files': [
+ # jinja2/__init__.py contains version string, so sufficient as
+ # dependency for whole jinja2 package
+ '<(DEPTH)/third_party/jinja2/__init__.py',
+ '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep
+ '../build/scripts/hasher.py',
+ '../build/scripts/in_file.py',
+ '../build/scripts/in_generator.py',
+ '../build/scripts/license.py',
+ '../build/scripts/name_macros.py',
+ '../build/scripts/name_utilities.py',
+ '../build/scripts/template_expander.py',
+ '../build/scripts/templates/macros.tmpl',
abarth-chromium 2013/10/10 20:23:42 This file should go in Source/build/scripts/script
],
- 'defines': [
- 'BLINK_IMPLEMENTATION=1',
- 'INSIDE_BLINK',
- ],
- 'sources': [
- '<@(modules_files)',
- ],
- # Disable c4267 warnings until we fix size_t to int truncations.
- 'msvs_disabled_warnings': [ 4267, 4334, ]
- }],
+ },
}

Powered by Google App Engine
This is Rietveld 408576698