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

Side by Side Diff: chrome/chrome_android.gypi

Issue 23836002: Hacky Android dependency fix to allow infobar refactor patch to compile. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 3 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 | « no previous file | no next file » | 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 'package_name': 'chromium_testshell', 7 'package_name': 'chromium_testshell',
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'chrome_android_paks.gypi', # Included for the list of pak resources. 10 'chrome_android_paks.gypi', # Included for the list of pak resources.
11 ], 11 ],
12 'targets': [ 12 'targets': [
13 { 13 {
14 'target_name': 'libchromiumtestshell', 14 'target_name': 'libchromiumtestshell',
15 'type': 'shared_library', 15 'type': 'shared_library',
16 'dependencies': [ 16 'dependencies': [
17 '../base/base.gyp:base', 17 '../base/base.gyp:base',
18 'chrome_android_core', 18 'chrome_android_core',
19 'chrome_android_auxiliary', 19 'chrome_android_auxiliary',
20 'chromium_testshell_jni_headers', 20 'chromium_testshell_jni_headers',
21 'chrome.gyp:browser_ui', 21 'chrome.gyp:browser_ui',
22 '../content/content.gyp:content_app_browser', 22 '../content/content.gyp:content_app_browser',
23 # TODO(miguelg): This should be indirect, see http://crbug.com/280695 .
24 '../skia/skia.gyp:skia',
23 ], 25 ],
24 'sources': [ 26 'sources': [
25 # This file must always be included in the shared_library step to ensure 27 # This file must always be included in the shared_library step to ensure
26 # JNI_OnLoad is exported. 28 # JNI_OnLoad is exported.
27 'app/android/chrome_jni_onload.cc', 29 'app/android/chrome_jni_onload.cc',
28 'android/testshell/chrome_main_delegate_testshell_android.cc', 30 'android/testshell/chrome_main_delegate_testshell_android.cc',
29 'android/testshell/chrome_main_delegate_testshell_android.h', 31 'android/testshell/chrome_main_delegate_testshell_android.h',
30 "android/testshell/testshell_google_location_settings_helper.cc", 32 "android/testshell/testshell_google_location_settings_helper.cc",
31 "android/testshell/testshell_google_location_settings_helper.h", 33 "android/testshell/testshell_google_location_settings_helper.h",
32 'android/testshell/testshell_tab.cc', 34 'android/testshell/testshell_tab.cc',
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 { 157 {
156 'destination': '<(chrome_android_pak_output_folder)', 158 'destination': '<(chrome_android_pak_output_folder)',
157 'files': [ 159 'files': [
158 '<@(chrome_android_pak_input_resources)', 160 '<@(chrome_android_pak_input_resources)',
159 ], 161 ],
160 } 162 }
161 ], 163 ],
162 }, 164 },
163 ], 165 ],
164 } 166 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698