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

Side by Side Diff: content/content_shell.gypi

Issue 10802064: Make content_shell and content_browsertests working with aura (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: add chrome packed_resources dependency for executable binary 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
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | content/test/content_browser_test.cc » ('J')
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 'content_shell_product_name': 'Content Shell', 7 'content_shell_product_name': 'Content Shell',
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 '../webkit/support/webkit_support.gyp:webkit_support', 139 '../webkit/support/webkit_support.gyp:webkit_support',
140 ], 140 ],
141 }, { # else: OS=="android" 141 }, { # else: OS=="android"
142 'dependencies': [ 142 'dependencies': [
143 'content_shell_jni_headers', 143 'content_shell_jni_headers',
144 ], 144 ],
145 'include_dirs': [ 145 'include_dirs': [
146 '<(SHARED_INTERMEDIATE_DIR)/content/shell', 146 '<(SHARED_INTERMEDIATE_DIR)/content/shell',
147 ], 147 ],
148 }], # OS=="android" 148 }], # OS=="android"
149 ['os_posix==1 and use_aura==1 and linux_use_tcmalloc==1', {
150 'dependencies': [
151 # This is needed by content/app/content_main_runner.cc
152 '../base/allocator/allocator.gyp:allocator',
153 ],
154 }],
149 ['use_aura==1', { 155 ['use_aura==1', {
156 'dependencies': [
157 '../ui/aura/aura.gyp:aura',
158 '../ui/base/strings/ui_strings.gyp:ui_strings',
159 '../ui/views/views.gyp:views',
160 '../ui/ui.gyp:ui_resources',
161 ],
150 'sources/': [ 162 'sources/': [
151 ['exclude', 'shell/shell_gtk.cc'], 163 ['exclude', 'shell/shell_gtk.cc'],
152 ['exclude', 'shell/shell_win.cc'], 164 ['exclude', 'shell/shell_win.cc'],
153 ], 165 ],
154 }], # use_aura==1 166 }], # use_aura==1
167 ['chromeos==1', {
168 'dependencies': [
169 '../chromeos/chromeos.gyp:chromeos',
170 ],
171 }], # chromeos==1
155 ['inside_chromium_build==0 or component!="shared_library"', { 172 ['inside_chromium_build==0 or component!="shared_library"', {
156 'dependencies': [ 173 'dependencies': [
157 '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_te st_support', 174 '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_te st_support',
158 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf', 175 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
159 ], 176 ],
160 'include_dirs': [ 177 'include_dirs': [
161 # Required for WebTestingSupport.cpp to find our custom config.h. 178 # Required for WebTestingSupport.cpp to find our custom config.h.
162 'shell/', 179 'shell/',
163 '<(webkit_src_dir)/Source/WebKit/chromium/public', 180 '<(webkit_src_dir)/Source/WebKit/chromium/public',
164 # WARNING: Do not view this particular case as a precedent for 181 # WARNING: Do not view this particular case as a precedent for
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', { 333 ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
317 'dependencies': [ 334 'dependencies': [
318 '../sandbox/sandbox.gyp:sandbox', 335 '../sandbox/sandbox.gyp:sandbox',
319 ], 336 ],
320 }], # OS=="win" or (toolkit_uses_gtk == 1 and selinux == 0) 337 }], # OS=="win" or (toolkit_uses_gtk == 1 and selinux == 0)
321 ['toolkit_uses_gtk == 1', { 338 ['toolkit_uses_gtk == 1', {
322 'dependencies': [ 339 'dependencies': [
323 '<(DEPTH)/build/linux/system.gyp:gtk', 340 '<(DEPTH)/build/linux/system.gyp:gtk',
324 ], 341 ],
325 }], # toolkit_uses_gtk 342 }], # toolkit_uses_gtk
343 ['use_aura==1', {
344 'dependencies': [
345 '../chrome/chrome_resources.gyp:packed_resources',
346 ],
347 }], # use_aura
326 ['OS=="mac"', { 348 ['OS=="mac"', {
327 'product_name': '<(content_shell_product_name)', 349 'product_name': '<(content_shell_product_name)',
328 'dependencies!': [ 350 'dependencies!': [
329 'content_shell_lib', 351 'content_shell_lib',
330 ], 352 ],
331 'dependencies': [ 353 'dependencies': [
332 'content_shell_framework', 354 'content_shell_framework',
333 'content_shell_helper_app', 355 'content_shell_helper_app',
334 ], 356 ],
335 'copies': [ 357 'copies': [
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 '-buildfile', 666 '-buildfile',
645 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 667 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
646 ] 668 ]
647 } 669 }
648 ], 670 ],
649 }, 671 },
650 ], 672 ],
651 }], # OS=="android" 673 }], # OS=="android"
652 ] 674 ]
653 } 675 }
OLDNEW
« no previous file with comments | « no previous file | content/content_tests.gypi » ('j') | content/test/content_browser_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698