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

Side by Side Diff: trunk/src/remoting/remoting.gyp

Issue 25161002: Revert 225857 "gfx: Create a separate gfx component out of ui." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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 | « trunk/src/printing/printing.gyp ('k') | trunk/src/tools/memory_watcher/memory_watcher.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': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'conditions': [ 10 'conditions': [
(...skipping 2415 matching lines...) Expand 10 before | Expand all | Expand 10 after
2426 'includes': [ '../build/grit_target.gypi' ], 2426 'includes': [ '../build/grit_target.gypi' ],
2427 }, # end of target 'remoting_resources' 2427 }, # end of target 'remoting_resources'
2428 2428
2429 { 2429 {
2430 'target_name': 'remoting_base', 2430 'target_name': 'remoting_base',
2431 'type': 'static_library', 2431 'type': 'static_library',
2432 'variables': { 'enable_wexit_time_destructors': 1, }, 2432 'variables': { 'enable_wexit_time_destructors': 1, },
2433 'dependencies': [ 2433 'dependencies': [
2434 '../base/base.gyp:base', 2434 '../base/base.gyp:base',
2435 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 2435 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
2436 '../ui/gfx/gfx.gyp:gfx',
2437 '../ui/ui.gyp:ui', 2436 '../ui/ui.gyp:ui',
2438 '../net/net.gyp:net', 2437 '../net/net.gyp:net',
2439 '../skia/skia.gyp:skia', 2438 '../skia/skia.gyp:skia',
2440 '../third_party/libvpx/libvpx.gyp:libvpx', 2439 '../third_party/libvpx/libvpx.gyp:libvpx',
2441 '../third_party/libyuv/libyuv.gyp:libyuv', 2440 '../third_party/libyuv/libyuv.gyp:libyuv',
2442 '../third_party/opus/opus.gyp:opus', 2441 '../third_party/opus/opus.gyp:opus',
2443 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 2442 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
2444 '../media/media.gyp:media', 2443 '../media/media.gyp:media',
2445 '../media/media.gyp:shared_memory_support', 2444 '../media/media.gyp:shared_memory_support',
2446 'remoting_jingle_glue', 2445 'remoting_jingle_glue',
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
2730 'type': 'executable', 2729 'type': 'executable',
2731 'dependencies': [ 2730 'dependencies': [
2732 '../base/base.gyp:base', 2731 '../base/base.gyp:base',
2733 '../base/base.gyp:base_i18n', 2732 '../base/base.gyp:base_i18n',
2734 '../base/base.gyp:test_support_base', 2733 '../base/base.gyp:test_support_base',
2735 '../ipc/ipc.gyp:ipc', 2734 '../ipc/ipc.gyp:ipc',
2736 '../net/net.gyp:net_test_support', 2735 '../net/net.gyp:net_test_support',
2737 '../ppapi/ppapi.gyp:ppapi_cpp', 2736 '../ppapi/ppapi.gyp:ppapi_cpp',
2738 '../testing/gmock.gyp:gmock', 2737 '../testing/gmock.gyp:gmock',
2739 '../testing/gtest.gyp:gtest', 2738 '../testing/gtest.gyp:gtest',
2740 '../ui/gfx/gfx.gyp:gfx',
2741 '../ui/ui.gyp:ui', 2739 '../ui/ui.gyp:ui',
2742 'remoting_base', 2740 'remoting_base',
2743 'remoting_breakpad', 2741 'remoting_breakpad',
2744 'remoting_client', 2742 'remoting_client',
2745 'remoting_client_plugin', 2743 'remoting_client_plugin',
2746 'remoting_host', 2744 'remoting_host',
2747 'remoting_host_event_logger', 2745 'remoting_host_event_logger',
2748 'remoting_host_setup_base', 2746 'remoting_host_setup_base',
2749 'remoting_jingle_glue', 2747 'remoting_jingle_glue',
2750 'remoting_protocol', 2748 'remoting_protocol',
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
2952 '../base/allocator/allocator.gyp:allocator', 2950 '../base/allocator/allocator.gyp:allocator',
2953 ], 2951 ],
2954 }, 2952 },
2955 ], 2953 ],
2956 ], 2954 ],
2957 }], # end of 'toolkit_uses_gtk == 1' 2955 }], # end of 'toolkit_uses_gtk == 1'
2958 ], # end of 'conditions' 2956 ], # end of 'conditions'
2959 }, # end of target 'remoting_unittests' 2957 }, # end of target 'remoting_unittests'
2960 ], # end of targets 2958 ], # end of targets
2961 } 2959 }
OLDNEW
« no previous file with comments | « trunk/src/printing/printing.gyp ('k') | trunk/src/tools/memory_watcher/memory_watcher.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698