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

Side by Side Diff: chrome/chrome_android.gypi

Issue 14994003: Remove round trip from data reduction proxy authentication (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed gyp issues Created 7 years, 6 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/profiles/profile_impl_io_data.cc ('k') | chrome/chrome_tests_unit.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 '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 'chromium_testshell_jni_headers', 20 'chromium_testshell_jni_headers',
20 'chrome.gyp:browser_ui', 21 'chrome.gyp:browser_ui',
21 ], 22 ],
22 'sources': [ 23 'sources': [
23 # 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
24 # JNI_OnLoad is exported. 25 # JNI_OnLoad is exported.
25 'app/android/chrome_jni_onload.cc', 26 'app/android/chrome_jni_onload.cc',
26
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', 31 'android/testshell/testshell_tab.cc',
32 'android/testshell/testshell_tab.h', 32 'android/testshell/testshell_tab.h',
33 'android/testshell/testshell_stubs.cc', 33 'android/testshell/testshell_stubs.cc',
34 ], 34 ],
35 'include_dirs': [ 35 'include_dirs': [
36 '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell', 36 '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 ], 105 ],
106 'include_dirs': [ 106 'include_dirs': [
107 '..', 107 '..',
108 '<(SHARED_INTERMEDIATE_DIR)/android', 108 '<(SHARED_INTERMEDIATE_DIR)/android',
109 '<(SHARED_INTERMEDIATE_DIR)/chrome', 109 '<(SHARED_INTERMEDIATE_DIR)/chrome',
110 '<(android_ndk_include)', 110 '<(android_ndk_include)',
111 ], 111 ],
112 'sources': [ 112 'sources': [
113 'app/android/chrome_android_initializer.cc', 113 'app/android/chrome_android_initializer.cc',
114 'app/android/chrome_android_initializer.h', 114 'app/android/chrome_android_initializer.h',
115 'app/android/chrome_data_reduction_proxy_android.cc',
116 'app/android/chrome_data_reduction_proxy_android.h',
115 'app/android/chrome_main_delegate_android.cc', 117 'app/android/chrome_main_delegate_android.cc',
116 'app/android/chrome_main_delegate_android.h', 118 'app/android/chrome_main_delegate_android.h',
117 'app/chrome_main_delegate.cc', 119 'app/chrome_main_delegate.cc',
118 'app/chrome_main_delegate.h', 120 'app/chrome_main_delegate.h',
119 ], 121 ],
120 'link_settings': { 122 'link_settings': {
121 'libraries': [ 123 'libraries': [
122 '-landroid', 124 '-landroid',
123 '-ljnigraphics', 125 '-ljnigraphics',
124 ], 126 ],
125 }, 127 },
126 }, 128 },
127 { 129 {
130 'target_name': 'chrome_android_auxiliary',
131 'type': 'static_library',
132 'include_dirs': [
133 '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
134 ],
135 'sources': [
136 'android/testshell/chrome_data_reduction_proxy_testshell_android.cc',
137 ],
138 'dependencies': [
139 '../base/base.gyp:base',
140 ],
141 },
142 {
128 'target_name': 'chromium_testshell_paks', 143 'target_name': 'chromium_testshell_paks',
129 'type': 'none', 144 'type': 'none',
130 'dependencies': [ 145 'dependencies': [
131 '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', 146 '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',
132 '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', 147 '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources',
133 ], 148 ],
134 'copies': [ 149 'copies': [
135 { 150 {
136 'destination': '<(chrome_android_pak_output_folder)', 151 'destination': '<(chrome_android_pak_output_folder)',
137 'files': [ 152 'files': [
138 '<@(chrome_android_pak_input_resources)', 153 '<@(chrome_android_pak_input_resources)',
139 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', 154 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
140 ], 155 ],
141 } 156 }
142 ], 157 ],
143 }, 158 },
144 ], 159 ],
145 } 160 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chrome/chrome_tests_unit.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698