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

Side by Side Diff: chrome/chrome_android.gypi

Issue 108803002: Make TabBase non abstract (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years 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
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.
(...skipping 10 matching lines...) Expand all
21 '../content/content.gyp:content_app_browser', 21 '../content/content.gyp:content_app_browser',
22 ], 22 ],
23 'sources': [ 23 'sources': [
24 # This file must always be included in the shared_library step to ensure 24 # This file must always be included in the shared_library step to ensure
25 # JNI_OnLoad is exported. 25 # JNI_OnLoad is exported.
26 'app/android/chrome_jni_onload.cc', 26 'app/android/chrome_jni_onload.cc',
27 'android/testshell/chrome_main_delegate_testshell_android.cc', 27 'android/testshell/chrome_main_delegate_testshell_android.cc',
28 'android/testshell/chrome_main_delegate_testshell_android.h', 28 'android/testshell/chrome_main_delegate_testshell_android.h',
29 "android/testshell/testshell_google_location_settings_helper.cc", 29 "android/testshell/testshell_google_location_settings_helper.cc",
30 "android/testshell/testshell_google_location_settings_helper.h", 30 "android/testshell/testshell_google_location_settings_helper.h",
31 'android/testshell/testshell_tab.cc',
32 'android/testshell/testshell_tab.h',
33 ], 31 ],
34 'include_dirs': [ 32 'include_dirs': [
35 '../skia/config', 33 '../skia/config',
36 ], 34 ],
37 'conditions': [ 35 'conditions': [
38 [ 'order_profiling!=0', { 36 [ 'order_profiling!=0', {
39 'conditions': [ 37 'conditions': [
40 [ 'OS=="android"', { 38 [ 'OS=="android"', {
41 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ], 39 'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
42 }], 40 }],
(...skipping 22 matching lines...) Expand all
65 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)', 63 'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
66 'native_lib_target': 'libchromiumtestshell', 64 'native_lib_target': 'libchromiumtestshell',
67 'native_lib_version_name': '<(version_full)', 65 'native_lib_version_name': '<(version_full)',
68 'additional_input_paths': [ 66 'additional_input_paths': [
69 '<@(chrome_android_pak_output_resources)', 67 '<@(chrome_android_pak_output_resources)',
70 ], 68 ],
71 }, 69 },
72 'includes': [ '../build/java_apk.gypi', ], 70 'includes': [ '../build/java_apk.gypi', ],
73 }, 71 },
74 { 72 {
75 'target_name': 'chromium_testshell_jni_headers', 73 'target_name': 'chromium_testshell_jni_headers',
Yaron 2013/12/18 02:15:55 Remove this target
David Trainor- moved to gerrit 2013/12/18 21:29:47 Ah good catch!
76 'type': 'none', 74 'type': 'none',
77 'sources': [ 75 'sources': [
78 'android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.j ava', 76 'android/testshell/java/src/org/chromium/chrome/testshell/TestShellTab.j ava',
79 ], 77 ],
80 'variables': { 78 'variables': {
81 'jni_gen_package': 'chromium_testshell', 79 'jni_gen_package': 'chromium_testshell',
82 'jni_generator_ptr_type': 'long', 80 'jni_generator_ptr_type': 'long',
83 }, 81 },
84 'includes': [ '../build/jni_generator.gypi' ], 82 'includes': [ '../build/jni_generator.gypi' ],
85 }, 83 },
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 { 135 {
138 'destination': '<(chrome_android_pak_output_folder)', 136 'destination': '<(chrome_android_pak_output_folder)',
139 'files': [ 137 'files': [
140 '<@(chrome_android_pak_input_resources)', 138 '<@(chrome_android_pak_input_resources)',
141 ], 139 ],
142 } 140 }
143 ], 141 ],
144 }, 142 },
145 ], 143 ],
146 } 144 }
OLDNEW
« chrome/browser/android/tab_android.cc ('K') | « chrome/browser/android/tab_android.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698