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

Side by Side Diff: content/content_shell.gypi

Issue 10824043: make content_shell and content_browsertests works with aura (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update DEPS file for chromeos build config 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/shell/DEPS » ('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 '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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
223 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py', 240 'repack_path': '<(DEPTH)/tools/grit/grit/format/repack.py',
224 }, 241 },
225 'actions': [ 242 'actions': [
226 { 243 {
227 'action_name': 'repack_content_shell_pack', 244 'action_name': 'repack_content_shell_pack',
228 'variables': { 245 'variables': {
229 'pak_inputs': [ 246 'pak_inputs': [
230 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', 247 '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
231 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', 248 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
232 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', 249 '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
250 '<(SHARED_INTERMEDIATE_DIR)/ui/app_locale_settings/app_locale_sett ings_en-US.pak',
233 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_perce nt.pak', 251 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_perce nt.pak',
252 '<(SHARED_INTERMEDIATE_DIR)/ui/ui_strings/ui_strings_en-US.pak',
234 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', 253 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
235 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', 254 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak',
236 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', 255 '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak',
237 ], 256 ],
238 }, 257 },
239 'inputs': [ 258 'inputs': [
240 '<(repack_path)', 259 '<(repack_path)',
241 '<@(pak_inputs)', 260 '<@(pak_inputs)',
242 ], 261 ],
243 'action': ['python', '<(repack_path)', '<@(_outputs)', 262 'action': ['python', '<(repack_path)', '<@(_outputs)',
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
644 '-buildfile', 663 '-buildfile',
645 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml', 664 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk .xml',
646 ] 665 ]
647 } 666 }
648 ], 667 ],
649 }, 668 },
650 ], 669 ],
651 }], # OS=="android" 670 }], # OS=="android"
652 ] 671 ]
653 } 672 }
OLDNEW
« no previous file with comments | « no previous file | content/shell/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698