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

Side by Side Diff: chrome/chrome.gyp

Issue 876483002: NaCl: Move src/trusted/plugin/ to components/nacl/renderer/plugin/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update #include guards Created 5 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
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 # Define the common dependencies that contain all the actual 8 # Define the common dependencies that contain all the actual
9 # Chromium functionality. This list gets pulled in below by 9 # Chromium functionality. This list gets pulled in below by
10 # the link of the actual chrome (or chromium) executable on 10 # the link of the actual chrome (or chromium) executable on
(...skipping 30 matching lines...) Expand all
41 ], 41 ],
42 'conditions': [ 42 'conditions': [
43 [ 'cld_version==0 or cld_version==2', { 43 [ 'cld_version==0 or cld_version==2', {
44 'chromium_child_dependencies': [ 44 'chromium_child_dependencies': [
45 # Use whatever CLD2 data access mode that the application 45 # Use whatever CLD2 data access mode that the application
46 # embedder is using. 46 # embedder is using.
47 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ], 47 '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld2_platform_impl', ],
48 }], 48 }],
49 ['enable_plugins==1 and disable_nacl==0', { 49 ['enable_plugins==1 and disable_nacl==0', {
50 'chromium_child_dependencies': [ 50 'chromium_child_dependencies': [
51 '<(DEPTH)/ppapi/native_client/src/trusted/plugin/plugin.gyp:nacl_t rusted_plugin', 51 '<(DEPTH)/components/nacl/renderer/plugin/plugin.gyp:nacl_trusted_ plugin',
52 ], 52 ],
53 }], 53 }],
54 ['remoting==1', { 54 ['remoting==1', {
55 'chromium_child_dependencies': [ 55 'chromium_child_dependencies': [
56 '../remoting/remoting.gyp:remoting_client_plugin', 56 '../remoting/remoting.gyp:remoting_client_plugin',
57 ], 57 ],
58 }], 58 }],
59 ], 59 ],
60 }], 60 }],
61 ['enable_basic_printing==1 or enable_print_preview==1', { 61 ['enable_basic_printing==1 or enable_print_preview==1', {
(...skipping 714 matching lines...) Expand 10 before | Expand all | Expand 10 after
776 'service/service_utility_process_host.cc', 776 'service/service_utility_process_host.cc',
777 'service/service_utility_process_host.h', 777 'service/service_utility_process_host.h',
778 ], 778 ],
779 }], 779 }],
780 ], 780 ],
781 }, 781 },
782 ], 782 ],
783 }], 783 }],
784 ], # 'conditions' 784 ], # 'conditions'
785 } 785 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698