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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes for latest siggi review; merge with r83927 Created 9 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
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': '<(library)', 9 'type': '<(library)',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 13 matching lines...) Expand all
24 'safe_browsing_report_proto', 24 'safe_browsing_report_proto',
25 'syncapi', 25 'syncapi',
26 'theme_resources', 26 'theme_resources',
27 'theme_resources_large', 27 'theme_resources_large',
28 'theme_resources_standard', 28 'theme_resources_standard',
29 'userfeedback_proto', 29 'userfeedback_proto',
30 '../app/app.gyp:app_resources', 30 '../app/app.gyp:app_resources',
31 '../build/temp_gyp/googleurl.gyp:googleurl', 31 '../build/temp_gyp/googleurl.gyp:googleurl',
32 '../content/content.gyp:content_browser', 32 '../content/content.gyp:content_browser',
33 '../crypto/crypto.gyp:crypto', 33 '../crypto/crypto.gyp:crypto',
34 '../gpu/gpu.gyp:gpu_common',
35 '../media/media.gyp:media', 34 '../media/media.gyp:media',
36 '../ppapi/ppapi.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin 35 '../ppapi/ppapi.gyp:ppapi_proxy', # For PpapiMsg_LoadPlugin
37 '../printing/printing.gyp:printing', 36 '../printing/printing.gyp:printing',
38 '../skia/skia.gyp:skia', 37 '../skia/skia.gyp:skia',
39 '../third_party/bzip2/bzip2.gyp:bzip2', 38 '../third_party/bzip2/bzip2.gyp:bzip2',
40 '../third_party/expat/expat.gyp:expat', 39 '../third_party/expat/expat.gyp:expat',
41 '../third_party/hunspell/hunspell.gyp:hunspell', 40 '../third_party/hunspell/hunspell.gyp:hunspell',
42 '../third_party/icu/icu.gyp:icui18n', 41 '../third_party/icu/icu.gyp:icui18n',
43 '../third_party/icu/icu.gyp:icuuc', 42 '../third_party/icu/icu.gyp:icuuc',
44 '../third_party/libjingle/libjingle.gyp:libjingle', 43 '../third_party/libjingle/libjingle.gyp:libjingle',
(...skipping 4468 matching lines...) Expand 10 before | Expand all | Expand 10 after
4513 'hard_dependency': 1, 4512 'hard_dependency': 1,
4514 }, 4513 },
4515 ], 4514 ],
4516 } 4515 }
4517 4516
4518 # Local Variables: 4517 # Local Variables:
4519 # tab-width:2 4518 # tab-width:2
4520 # indent-tabs-mode:nil 4519 # indent-tabs-mode:nil
4521 # End: 4520 # End:
4522 # vim: set expandtab tabstop=2 shiftwidth=2: 4521 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698