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

Side by Side Diff: webkit/glue/webkit_glue.gypi

Issue 14823005: Remove inside_chromium_build gyp variable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort gyps, fix ios Created 7 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « webkit/compositor_bindings/compositor_bindings.gyp ('k') | webkit/gpu/webkit_gpu.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': {
7 'conditions': [
8 ['inside_chromium_build==0', {
9 'webkit_src_dir': '../../../../..',
10 },{
11 'webkit_src_dir': '../../third_party/WebKit',
12 }],
13 ],
14 },
15 'target_defaults': { 6 'target_defaults': {
16 # Disable narrowing-conversion-in-initialization-list warnings in that we 7 # Disable narrowing-conversion-in-initialization-list warnings in that we
17 # do not want to fix it in data file "webcursor_gtk_data.h". 8 # do not want to fix it in data file "webcursor_gtk_data.h".
18 'cflags+': ['-Wno-narrowing'], 9 'cflags+': ['-Wno-narrowing'],
19 'cflags_cc+': ['-Wno-narrowing'], 10 'cflags_cc+': ['-Wno-narrowing'],
20 }, 11 },
21 'targets': [ 12 'targets': [
22 { 13 {
23 'target_name': 'webkit_resources', 14 'target_name': 'webkit_resources',
24 'type': 'none', 15 'type': 'none',
25 'variables': { 16 'variables': {
26 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', 17 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
27 }, 18 },
28 'actions': [ 19 'actions': [
29 { 20 {
30 'action_name': 'webkit_resources', 21 'action_name': 'webkit_resources',
31 'variables': { 22 'variables': {
32 'grit_grd_file': 'resources/webkit_resources.grd', 23 'grit_grd_file': 'resources/webkit_resources.grd',
33 }, 24 },
34 'includes': [ '../../build/grit_action.gypi' ], 25 'includes': [ '../../build/grit_action.gypi' ],
35 }, 26 },
36 { 27 {
37 'action_name': 'webkit_chromium_resources', 28 'action_name': 'webkit_chromium_resources',
38 'variables': { 29 'variables': {
39 'grit_grd_file': '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gr d', 30 'grit_grd_file': '../../third_party/WebKit/Source/WebKit/chromium/We bKit.grd',
40 }, 31 },
41 'includes': [ '../../build/grit_action.gypi' ], 32 'includes': [ '../../build/grit_action.gypi' ],
42 }, 33 },
43 ], 34 ],
44 'includes': [ '../../build/grit_target.gypi' ], 35 'includes': [ '../../build/grit_target.gypi' ],
45 'direct_dependent_settings': { 36 'direct_dependent_settings': {
46 'include_dirs': [ '<(grit_out_dir)' ], 37 'include_dirs': [ '<(grit_out_dir)' ],
47 }, 38 },
48 }, 39 },
49 { 40 {
(...skipping 29 matching lines...) Expand all
79 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl', 70 '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
80 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 71 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
81 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 72 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
82 '<(DEPTH)/media/media.gyp:media', 73 '<(DEPTH)/media/media.gyp:media',
83 '<(DEPTH)/media/media.gyp:shared_memory_support', 74 '<(DEPTH)/media/media.gyp:shared_memory_support',
84 '<(DEPTH)/net/net.gyp:net', 75 '<(DEPTH)/net/net.gyp:net',
85 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c', 76 '<(DEPTH)/ppapi/ppapi.gyp:ppapi_c',
86 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', 77 '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
87 '<(DEPTH)/printing/printing.gyp:printing', 78 '<(DEPTH)/printing/printing.gyp:printing',
88 '<(DEPTH)/skia/skia.gyp:skia', 79 '<(DEPTH)/skia/skia.gyp:skia',
80 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
89 '<(DEPTH)/third_party/icu/icu.gyp:icui18n', 81 '<(DEPTH)/third_party/icu/icu.gyp:icui18n',
90 '<(DEPTH)/third_party/icu/icu.gyp:icuuc', 82 '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
91 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi', 83 '<(DEPTH)/third_party/npapi/npapi.gyp:npapi',
92 '<(DEPTH)/ui/gl/gl.gyp:gl', 84 '<(DEPTH)/ui/gl/gl.gyp:gl',
93 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme', 85 '<(DEPTH)/ui/native_theme/native_theme.gyp:native_theme',
94 '<(DEPTH)/ui/ui.gyp:ui', 86 '<(DEPTH)/ui/ui.gyp:ui',
95 '<(DEPTH)/ui/ui.gyp:ui_resources', 87 '<(DEPTH)/ui/ui.gyp:ui_resources',
96 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 88 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
97 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_support', 89 '<(DEPTH)/webkit/compositor_bindings/compositor_bindings.gyp:webkit_comp ositor_support',
98 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
99 'user_agent', 90 'user_agent',
100 'webkit_base', 91 'webkit_base',
101 'webkit_media', 92 'webkit_media',
102 'webkit_resources', 93 'webkit_resources',
103 'webkit_storage', 94 'webkit_storage',
104 'webkit_strings', 95 'webkit_strings',
105 ], 96 ],
106 'include_dirs': [ 97 'include_dirs': [
107 '<(INTERMEDIATE_DIR)', 98 '<(INTERMEDIATE_DIR)',
108 '<(SHARED_INTERMEDIATE_DIR)/webkit', 99 '<(SHARED_INTERMEDIATE_DIR)/webkit',
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 'sources/': [['exclude', '_posix\\.cc$']], 436 'sources/': [['exclude', '_posix\\.cc$']],
446 'include_dirs': [ 437 'include_dirs': [
447 '<(DEPTH)/third_party/wtl/include', 438 '<(DEPTH)/third_party/wtl/include',
448 ], 439 ],
449 'sources!': [ 440 'sources!': [
450 'plugins/plugin_stubs.cc', 441 'plugins/plugin_stubs.cc',
451 ], 442 ],
452 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 443 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
453 'msvs_disabled_warnings': [ 4800, 4267 ], 444 'msvs_disabled_warnings': [ 4800, 4267 ],
454 'conditions': [ 445 'conditions': [
455 ['inside_chromium_build==1 and component=="shared_library"', { 446 ['component=="shared_library"', {
456 'dependencies': [ 447 'dependencies': [
457 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 448 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:w ebkit',
458 ], 449 ],
459 'export_dependent_settings': [ 450 'export_dependent_settings': [
460 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 451 '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp: webkit',
461 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8', 452 '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
462 ], 453 ],
463 }], 454 }],
464 ], 455 ],
465 }], 456 }],
466 ['inside_chromium_build==0', {
467 'dependencies': [
468 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
469 ],
470 }],
471 ['OS=="android"', { 457 ['OS=="android"', {
472 'dependencies': [ 458 'dependencies': [
473 'overscroller_jni_headers', 459 'overscroller_jni_headers',
474 ], 460 ],
475 }], 461 }],
476 462
477 ], 463 ],
478 }, 464 },
479 ], 465 ],
480 'conditions': [ 466 'conditions': [
(...skipping 26 matching lines...) Expand all
507 'variables': { 493 'variables': {
508 'jni_gen_package': 'webkit', 494 'jni_gen_package': 'webkit',
509 'input_java_class': 'android/widget/OverScroller.class', 495 'input_java_class': 'android/widget/OverScroller.class',
510 }, 496 },
511 'includes': [ '../../build/jar_file_jni_generator.gypi' ], 497 'includes': [ '../../build/jar_file_jni_generator.gypi' ],
512 }, 498 },
513 ], 499 ],
514 }], 500 }],
515 ], 501 ],
516 } 502 }
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/compositor_bindings.gyp ('k') | webkit/gpu/webkit_gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698