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

Side by Side Diff: content/content_browser.gypi

Issue 11414180: Add a gyp flag to allow removing dependency on ppapi. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed Jay's comments and rebase Created 8 years 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
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': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 ['chromeos==1', { 8 ['chromeos==1', {
9 'use_libgps%': 1, 9 'use_libgps%': 1,
10 }, { # chromeos==0 10 }, { # chromeos==0
(...skipping 911 matching lines...) Expand 10 before | Expand all | Expand 10 after
922 ['include', '^browser/speech/'], 922 ['include', '^browser/speech/'],
923 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.cc$$'], 923 ['exclude', '^browser/speech/input_tag_speech_dispatcher_host\\.cc$$'],
924 ['include', '^browser/user_metrics\\.cc$'], 924 ['include', '^browser/user_metrics\\.cc$'],
925 ['include', '^browser/web_contents/navigation_entry_impl\\.cc$'], 925 ['include', '^browser/web_contents/navigation_entry_impl\\.cc$'],
926 ], 926 ],
927 }, { # OS!="ios" 927 }, { # OS!="ios"
928 'dependencies': [ 928 'dependencies': [
929 'browser/debugger/devtools_resources.gyp:devtools_resources', 929 'browser/debugger/devtools_resources.gyp:devtools_resources',
930 '../cc/cc.gyp:cc', 930 '../cc/cc.gyp:cc',
931 '../net/net.gyp:http_server', 931 '../net/net.gyp:http_server',
932 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
933 '../printing/printing.gyp:printing', 932 '../printing/printing.gyp:printing',
934 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit', 933 '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
935 '../ui/surface/surface.gyp:surface', 934 '../ui/surface/surface.gyp:surface',
936 '../webkit/support/webkit_support.gyp:webkit_resources', 935 '../webkit/support/webkit_support.gyp:webkit_resources',
937 '../webkit/support/webkit_support.gyp:webkit_storage', 936 '../webkit/support/webkit_support.gyp:webkit_storage',
938 '../webkit/support/webkit_support.gyp:webkit_strings', 937 '../webkit/support/webkit_support.gyp:webkit_strings',
939 ], 938 ],
940 }], 939 }],
941 ['OS!="mac" and OS!="ios"', { 940 ['OS!="mac" and OS!="ios"', {
942 'dependencies': [ 941 'dependencies': [
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 'sources/': [ 1114 'sources/': [
1116 ['exclude', '^browser/renderer_host/image_transport_client.cc'], 1115 ['exclude', '^browser/renderer_host/image_transport_client.cc'],
1117 ['exclude', '^browser/renderer_host/image_transport_client.h'], 1116 ['exclude', '^browser/renderer_host/image_transport_client.h'],
1118 ['exclude', '^browser/renderer_host/image_transport_factory.cc'], 1117 ['exclude', '^browser/renderer_host/image_transport_factory.cc'],
1119 ['exclude', '^browser/renderer_host/image_transport_factory.h'], 1118 ['exclude', '^browser/renderer_host/image_transport_factory.h'],
1120 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'], 1119 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.cc'],
1121 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'], 1120 ['exclude', '^browser/renderer_host/render_widget_host_view_aura.h'],
1122 ['exclude', '^browser/renderer_host/tap_suppression_controller_aura.cc'] , 1121 ['exclude', '^browser/renderer_host/tap_suppression_controller_aura.cc'] ,
1123 ], 1122 ],
1124 }], 1123 }],
1124 ['enable_ppapi==1', {
1125 'dependencies': [
1126 '../ppapi/ppapi_internal.gyp:ppapi_ipc',
1127 ],
1128 }, { # enable_ppapi==0
1129 'sources!': [
1130 'browser/ppapi_plugin_process_host.cc',
1131 ],
1132 'sources/': [
1133 ['exclude', '^browser/renderer_host/pepper/'],
1134 ],
1135 }],
1125 ['java_bridge==1', { 1136 ['java_bridge==1', {
1126 'defines': [ 1137 'defines': [
1127 'ENABLE_JAVA_BRIDGE', 1138 'ENABLE_JAVA_BRIDGE',
1128 ], 1139 ],
1129 }, { 1140 }, {
1130 'sources/': [ 1141 'sources/': [
1131 ['exclude', '^browser/renderer_host/java/'], 1142 ['exclude', '^browser/renderer_host/java/'],
1132 ], 1143 ],
1133 }], 1144 }],
1134 ['input_speech==0', { 1145 ['input_speech==0', {
(...skipping 10 matching lines...) Expand all
1145 # the USE_LIBGPS setting propagates to the "real" dependent target, 1156 # the USE_LIBGPS setting propagates to the "real" dependent target,
1146 # we use all_dependent_settings here. 1157 # we use all_dependent_settings here.
1147 'all_dependent_settings': { 1158 'all_dependent_settings': {
1148 'defines': [ 1159 'defines': [
1149 'USE_LIBGPS', 1160 'USE_LIBGPS',
1150 ], 1161 ],
1151 }, 1162 },
1152 }], 1163 }],
1153 ], 1164 ],
1154 } 1165 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698