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

Side by Side Diff: chrome/chrome_android.gypi

Issue 10968003: Add rendering support to the TestShell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed nits, rebased. Created 8 years, 2 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/chrome_browser.gypi » ('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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'includes': [ 8 'includes': [
9 'chrome_android_paks.gypi', # Included for the list of pak resources. 9 'chrome_android_paks.gypi', # Included for the list of pak resources.
10 ], 10 ],
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'libchromiumtestshell', 13 'target_name': 'libchromiumtestshell',
14 'type': 'shared_library', 14 'type': 'shared_library',
15 'dependencies': [ 15 'dependencies': [
16 'chrome_android_core', 16 'chrome_android_core',
17 'chromium_testshell_jni_headers',
17 ], 18 ],
18 'sources': [ 19 'sources': [
19 'android/testshell/chrome_main_delegate_testshell_android.cc', 20 'android/testshell/chrome_main_delegate_testshell_android.cc',
20 'android/testshell/chrome_main_delegate_testshell_android.h', 21 'android/testshell/chrome_main_delegate_testshell_android.h',
22 'android/testshell/tab_manager.cc',
23 'android/testshell/tab_manager.h',
21 'android/testshell/testshell_entry_point.cc', 24 'android/testshell/testshell_entry_point.cc',
22 'android/testshell/testshell_stubs.cc', 25 'android/testshell/testshell_stubs.cc',
23 ], 26 ],
24 'include_dirs': [ 27 'include_dirs': [
25 '<(SHARED_INTERMEDIATE_DIR)/android', 28 '<(SHARED_INTERMEDIATE_DIR)/android',
29 '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
26 '../skia/config', 30 '../skia/config',
27 ], 31 ],
28 'conditions': [ 32 'conditions': [
29 [ 'order_profiling!=0', { 33 [ 'order_profiling!=0', {
30 'conditions': [ 34 'conditions': [
31 [ 'OS="android"', { 35 [ 'OS="android"', {
32 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], 36 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
33 }], 37 }],
34 ], 38 ],
35 }], 39 }],
(...skipping 26 matching lines...) Expand all
62 '--strip-unneeded', 66 '--strip-unneeded',
63 '<@(_inputs)', 67 '<@(_inputs)',
64 '-o', 68 '-o',
65 '<@(_outputs)', 69 '<@(_outputs)',
66 ], 70 ],
67 }, 71 },
68 ], 72 ],
69 'includes': [ '../build/java_apk.gypi', ], 73 'includes': [ '../build/java_apk.gypi', ],
70 }, 74 },
71 { 75 {
76 'target_name': 'chromium_testshell_jni_headers',
77 'type': 'none',
78 'sources': [
79 'android/testshell/java/src/org/chromium/chrome/testshell/TabManager.jav a',
80 ],
81 'variables': {
82 'jni_gen_dir': 'chromium_testshell',
83 },
84 'includes': [ '../build/jni_generator.gypi' ],
85 },
86 {
72 'target_name': 'chrome_android_core', 87 'target_name': 'chrome_android_core',
73 'type': 'static_library', 88 'type': 'static_library',
74 'dependencies': [ 89 'dependencies': [
75 'chrome.gyp:browser', 90 'chrome.gyp:browser',
76 'chrome.gyp:plugin', 91 'chrome.gyp:plugin',
77 'chrome.gyp:renderer', 92 'chrome.gyp:renderer',
78 'chrome.gyp:utility', 93 'chrome.gyp:utility',
79 '../content/content.gyp:content', 94 '../content/content.gyp:content',
80 ], 95 ],
81 'include_dirs': [ 96 'include_dirs': [
(...skipping 27 matching lines...) Expand all
109 'copies': [ 124 'copies': [
110 { 125 {
111 'destination': '<(chrome_android_pak_output_folder)', 126 'destination': '<(chrome_android_pak_output_folder)',
112 'files': [ '<@(chrome_android_pak_input_resources)' ], 127 'files': [ '<@(chrome_android_pak_input_resources)' ],
113 } 128 }
114 ], 129 ],
115 }, 130 },
116 ], 131 ],
117 } 132 }
118 133
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698