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

Side by Side Diff: Source/core/core.gyp

Issue 60633007: Remove duplicated rule from core.gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Remove scons_line_length Created 7 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # 1 #
2 # Copyright (C) 2009 Google Inc. All rights reserved. 2 # Copyright (C) 2009 Google Inc. All rights reserved.
3 # 3 #
4 # Redistribution and use in source and binary forms, with or without 4 # Redistribution and use in source and binary forms, with or without
5 # modification, are permitted provided that the following conditions are 5 # modification, are permitted provided that the following conditions are
6 # met: 6 # met:
7 # 7 #
8 # * Redistributions of source code must retain the above copyright 8 # * Redistributions of source code must retain the above copyright
9 # notice, this list of conditions and the following disclaimer. 9 # notice, this list of conditions and the following disclaimer.
10 # * Redistributions in binary form must reproduce the above 10 # * Redistributions in binary form must reproduce the above
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 'direct_dependent_settings': { 398 'direct_dependent_settings': {
399 'defines': [ 399 'defines': [
400 'BLINK_IMPLEMENTATION=1', 400 'BLINK_IMPLEMENTATION=1',
401 'INSIDE_BLINK', 401 'INSIDE_BLINK',
402 ], 402 ],
403 'include_dirs': [ 403 'include_dirs': [
404 '<@(webcore_include_dirs)', 404 '<@(webcore_include_dirs)',
405 '<(DEPTH)/gpu', 405 '<(DEPTH)/gpu',
406 '<(DEPTH)/third_party/angle_dx11/include', 406 '<(DEPTH)/third_party/angle_dx11/include',
407 ], 407 ],
408 'msvs_disabled_warnings': [
409 4138, 4244, 4291, 4305, 4344, 4355, 4521, 4099,
410 ],
411 'scons_line_length' : 1,
412 'xcode_settings': { 408 'xcode_settings': {
413 # Some Mac-specific parts of WebKit won't compile without having this 409 # Some Mac-specific parts of WebKit won't compile without having this
414 # prefix header injected. 410 # prefix header injected.
415 # FIXME: make this a first-class setting. 411 # FIXME: make this a first-class setting.
416 'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h', 412 'GCC_PREFIX_HEADER': 'WebCorePrefixMac.h',
417 }, 413 },
418 }, 414 },
419 'conditions': [ 415 'conditions': [
420 ['OS=="win" and component=="shared_library"', { 416 ['OS=="win" and component=="shared_library"', {
421 'direct_dependent_settings': { 417 'direct_dependent_settings': {
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after
1088 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h', 1084 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRect.h',
1089 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp', 1085 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.cpp',
1090 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h', 1086 '<(SHARED_INTERMEDIATE_DIR)/blink/bindings/V8LayerRectList.h',
1091 ], 1087 ],
1092 'sources/': [ 1088 'sources/': [
1093 ['exclude', 'testing/js'], 1089 ['exclude', 'testing/js'],
1094 ], 1090 ],
1095 }, 1091 },
1096 ], # targets 1092 ], # targets
1097 } 1093 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698