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: content/content_shell.gypi

Issue 10832112: Simplify devtools code on android and enable devtools for android content_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Pavel's comments Created 8 years, 4 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 'variables': { 6 'variables': {
7 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 'shell/shell_browser_main_parts.cc', 68 'shell/shell_browser_main_parts.cc',
69 'shell/shell_browser_main_parts.h', 69 'shell/shell_browser_main_parts.h',
70 'shell/shell_browser_main_parts_mac.mm', 70 'shell/shell_browser_main_parts_mac.mm',
71 'shell/shell_content_browser_client.cc', 71 'shell/shell_content_browser_client.cc',
72 'shell/shell_content_browser_client.h', 72 'shell/shell_content_browser_client.h',
73 'shell/shell_content_client.cc', 73 'shell/shell_content_client.cc',
74 'shell/shell_content_client.h', 74 'shell/shell_content_client.h',
75 'shell/shell_content_renderer_client.cc', 75 'shell/shell_content_renderer_client.cc',
76 'shell/shell_content_renderer_client.h', 76 'shell/shell_content_renderer_client.h',
77 'shell/shell_devtools_delegate.cc', 77 'shell/shell_devtools_delegate.cc',
78 'shell/shell_devtools_delegate_android.cc',
78 'shell/shell_devtools_delegate.h', 79 'shell/shell_devtools_delegate.h',
79 'shell/shell_download_manager_delegate.cc', 80 'shell/shell_download_manager_delegate.cc',
80 'shell/shell_download_manager_delegate.h', 81 'shell/shell_download_manager_delegate.h',
81 'shell/shell_javascript_dialog_creator.cc', 82 'shell/shell_javascript_dialog_creator.cc',
82 'shell/shell_javascript_dialog_creator.h', 83 'shell/shell_javascript_dialog_creator.h',
83 'shell/shell_javascript_dialog_gtk.cc', 84 'shell/shell_javascript_dialog_gtk.cc',
84 'shell/shell_javascript_dialog_mac.mm', 85 'shell/shell_javascript_dialog_mac.mm',
85 'shell/shell_javascript_dialog_win.cc', 86 'shell/shell_javascript_dialog_win.cc',
86 'shell/shell_javascript_dialog.h', 87 'shell/shell_javascript_dialog.h',
87 'shell/shell_login_dialog_gtk.cc', 88 'shell/shell_login_dialog_gtk.cc',
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 'configurations': { 128 'configurations': {
128 'Debug_Base': { 129 'Debug_Base': {
129 'msvs_settings': { 130 'msvs_settings': {
130 'VCLinkerTool': { 131 'VCLinkerTool': {
131 'LinkIncremental': '<(msvs_large_module_debug_link_mode)', 132 'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
132 }, 133 },
133 }, 134 },
134 }, 135 },
135 }, 136 },
136 }], # OS=="win" 137 }], # OS=="win"
137 ['OS!="android"', { 138 ['OS=="android"', {
138 'dependencies': [
139 # This dependency is for running DRT against the content shell, and
140 # this combination is not yet supported on Android.
141 '../webkit/support/webkit_support.gyp:webkit_support',
142 ],
143 }, { # else: OS=="android"
144 'dependencies': [ 139 'dependencies': [
145 'content_shell_jni_headers', 140 'content_shell_jni_headers',
146 ], 141 ],
147 'include_dirs': [ 142 'include_dirs': [
148 '<(SHARED_INTERMEDIATE_DIR)/content/shell', 143 '<(SHARED_INTERMEDIATE_DIR)/content/shell',
149 ], 144 ],
145 'sources!': [
146 'shell/shell_devtools_delegate.cc',
147 ],
148 }, { # else: OS!="android"
149 'dependencies': [
150 # This dependency is for running DRT against the content shell, and
151 # this combination is not yet supported on Android.
152 '../webkit/support/webkit_support.gyp:webkit_support',
153 ],
150 }], # OS=="android" 154 }], # OS=="android"
151 ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', { 155 ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', {
152 'dependencies': [ 156 'dependencies': [
153 # This is needed by content/app/content_main_runner.cc 157 # This is needed by content/app/content_main_runner.cc
154 '../base/allocator/allocator.gyp:allocator', 158 '../base/allocator/allocator.gyp:allocator',
155 ], 159 ],
156 }], 160 }],
157 ['use_aura==1', { 161 ['use_aura==1', {
158 'dependencies': [ 162 'dependencies': [
159 '../ui/aura/aura.gyp:aura', 163 '../ui/aura/aura.gyp:aura',
(...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 'dependencies': [ 658 'dependencies': [
655 'content_java', 659 'content_java',
656 ], 660 ],
657 } 661 }
658 ], 662 ],
659 }, 663 },
660 ], 664 ],
661 }], # OS=="android" 665 }], # OS=="android"
662 ] 666 ]
663 } 667 }
OLDNEW
« no previous file with comments | « content/content_jni.gypi ('k') | content/public/android/java/src/org/chromium/content/browser/RemoteDebuggingController.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698