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

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: Created 8 years, 5 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/shell/shell.h » ('j') | content/shell/shell.h » ('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 ['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
155 ['inside_chromium_build==0 or component!="shared_library"', { 167 ['inside_chromium_build==0 or component!="shared_library"', {
156 'dependencies': [ 168 'dependencies': [
157 '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_te st_support', 169 '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_te st_support',
158 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf', 170 '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
159 ], 171 ],
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 '-buildfile', 656 '-buildfile',
645 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 657 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
646 ] 658 ]
647 } 659 }
648 ], 660 ],
649 }, 661 },
650 ], 662 ],
651 }], # OS=="android" 663 }], # OS=="android"
652 ] 664 ]
653 } 665 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/shell.h » ('j') | content/shell/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698