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

Side by Side Diff: content/content_browser.gypi

Issue 12194007: Revert 180055: Very likely caused http://crbug.com/173885 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 10 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
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 'dependencies': [ 6 'dependencies': [
7 'browser/speech/proto/speech_proto.gyp:speech_proto', 7 'browser/speech/proto/speech_proto.gyp:speech_proto',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../google_apis/google_apis.gyp:google_apis', 10 '../google_apis/google_apis.gyp:google_apis',
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 'browser/system_message_window_win.cc', 846 'browser/system_message_window_win.cc',
847 'browser/system_message_window_win.h', 847 'browser/system_message_window_win.h',
848 'browser/tcmalloc_internals_request_job.cc', 848 'browser/tcmalloc_internals_request_job.cc',
849 'browser/tcmalloc_internals_request_job.h', 849 'browser/tcmalloc_internals_request_job.h',
850 'browser/tracing/trace_controller_impl.cc', 850 'browser/tracing/trace_controller_impl.cc',
851 'browser/tracing/trace_controller_impl.h', 851 'browser/tracing/trace_controller_impl.h',
852 'browser/tracing/trace_message_filter.cc', 852 'browser/tracing/trace_message_filter.cc',
853 'browser/tracing/trace_message_filter.h', 853 'browser/tracing/trace_message_filter.h',
854 'browser/tracing/trace_subscriber_stdio.cc', 854 'browser/tracing/trace_subscriber_stdio.cc',
855 'browser/tracing/trace_subscriber_stdio.h', 855 'browser/tracing/trace_subscriber_stdio.h',
856 'browser/tracing/tracing_ui.cc',
857 'browser/tracing/tracing_ui.h',
858 'browser/udev_linux.cc', 856 'browser/udev_linux.cc',
859 'browser/udev_linux.h', 857 'browser/udev_linux.h',
860 'browser/user_metrics.cc', 858 'browser/user_metrics.cc',
861 'browser/utility_process_host_impl.cc', 859 'browser/utility_process_host_impl.cc',
862 'browser/utility_process_host_impl.h', 860 'browser/utility_process_host_impl.h',
863 'browser/web_contents/debug_urls.cc', 861 'browser/web_contents/debug_urls.cc',
864 'browser/web_contents/debug_urls.h', 862 'browser/web_contents/debug_urls.h',
865 'browser/web_contents/drag_utils_gtk.cc', 863 'browser/web_contents/drag_utils_gtk.cc',
866 'browser/web_contents/drag_utils_gtk.h', 864 'browser/web_contents/drag_utils_gtk.h',
867 'browser/web_contents/interstitial_page_impl.cc', 865 'browser/web_contents/interstitial_page_impl.cc',
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1093 'link_settings': { 1091 'link_settings': {
1094 'libraries': [ 1092 'libraries': [
1095 '-ljnigraphics', 1093 '-ljnigraphics',
1096 ], 1094 ],
1097 }, 1095 },
1098 'sources!': [ 1096 'sources!': [
1099 'browser/geolocation/network_location_provider.cc', 1097 'browser/geolocation/network_location_provider.cc',
1100 'browser/geolocation/network_location_provider.h', 1098 'browser/geolocation/network_location_provider.h',
1101 'browser/geolocation/network_location_request.cc', 1099 'browser/geolocation/network_location_request.cc',
1102 'browser/geolocation/network_location_request.h', 1100 'browser/geolocation/network_location_request.h',
1103 'browser/tracing/tracing_ui.cc',
1104 'browser/tracing/tracing_ui.h',
1105 ], 1101 ],
1106 }, { # OS!="android" 1102 }, { # OS!="android"
1107 'dependencies': [ 1103 'dependencies': [
1108 '../third_party/flac/flac.gyp:libflac', 1104 '../third_party/flac/flac.gyp:libflac',
1109 '../third_party/speex/speex.gyp:libspeex', 1105 '../third_party/speex/speex.gyp:libspeex',
1110 ], 1106 ],
1111 }], 1107 }],
1112 ['OS=="mac"', { 1108 ['OS=="mac"', {
1113 'sources': [ 1109 'sources': [
1114 # Build necessary Mozilla sources 1110 # Build necessary Mozilla sources
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1222 ['exclude', '^browser/speech/'], 1218 ['exclude', '^browser/speech/'],
1223 ], 1219 ],
1224 }], 1220 }],
1225 ['linux_use_libgps==1', { 1221 ['linux_use_libgps==1', {
1226 'dependencies': [ 1222 'dependencies': [
1227 '../build/linux/system.gyp:libgps', 1223 '../build/linux/system.gyp:libgps',
1228 ], 1224 ],
1229 }], 1225 }],
1230 ], 1226 ],
1231 } 1227 }
OLDNEW
« no previous file with comments | « content/browser/webui/content_web_ui_controller_factory.cc ('k') | content/content_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698