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

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: Made Init a static function Created 7 years, 7 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
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 'chromium_testshell_jni_headers', 19 'chromium_testshell_jni_headers',
20 'chrome.gyp:browser_ui', 20 'chrome.gyp:browser_ui',
21 ], 21 ],
22 'sources': [ 22 'sources': [
23 # This file must always be included in the shared_library step to ensure 23 # This file must always be included in the shared_library step to ensure
24 # JNI_OnLoad is exported. 24 # JNI_OnLoad is exported.
25 'app/android/chrome_jni_onload.cc', 25 'app/android/chrome_jni_onload.cc',
26 26
27 'android/testshell/chrome_data_reduction_proxy_testshell_android.cc',
28 'android/testshell/chrome_data_reduction_proxy_testshell_android.h',
Yaron 2013/05/23 17:18:44 You don't have a .h file anymore
bengr 2013/05/24 01:01:47 Done.
27 'android/testshell/chrome_main_delegate_testshell_android.cc', 29 'android/testshell/chrome_main_delegate_testshell_android.cc',
28 'android/testshell/chrome_main_delegate_testshell_android.h', 30 'android/testshell/chrome_main_delegate_testshell_android.h',
29 "android/testshell/testshell_google_location_settings_helper.cc", 31 "android/testshell/testshell_google_location_settings_helper.cc",
30 "android/testshell/testshell_google_location_settings_helper.h", 32 "android/testshell/testshell_google_location_settings_helper.h",
31 'android/testshell/testshell_tab.cc', 33 'android/testshell/testshell_tab.cc',
32 'android/testshell/testshell_tab.h', 34 'android/testshell/testshell_tab.h',
33 'android/testshell/testshell_stubs.cc', 35 'android/testshell/testshell_stubs.cc',
34 ], 36 ],
35 'include_dirs': [ 37 'include_dirs': [
36 '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell', 38 '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 ], 107 ],
106 'include_dirs': [ 108 'include_dirs': [
107 '..', 109 '..',
108 '<(SHARED_INTERMEDIATE_DIR)/android', 110 '<(SHARED_INTERMEDIATE_DIR)/android',
109 '<(SHARED_INTERMEDIATE_DIR)/chrome', 111 '<(SHARED_INTERMEDIATE_DIR)/chrome',
110 '<(android_ndk_include)', 112 '<(android_ndk_include)',
111 ], 113 ],
112 'sources': [ 114 'sources': [
113 'app/android/chrome_android_initializer.cc', 115 'app/android/chrome_android_initializer.cc',
114 'app/android/chrome_android_initializer.h', 116 'app/android/chrome_android_initializer.h',
117 'app/android/chrome_data_reduction_proxy_android.cc',
118 'app/android/chrome_data_reduction_proxy_android.h',
115 'app/android/chrome_main_delegate_android.cc', 119 'app/android/chrome_main_delegate_android.cc',
116 'app/android/chrome_main_delegate_android.h', 120 'app/android/chrome_main_delegate_android.h',
117 'app/chrome_main_delegate.cc', 121 'app/chrome_main_delegate.cc',
118 'app/chrome_main_delegate.h', 122 'app/chrome_main_delegate.h',
119 ], 123 ],
120 'link_settings': { 124 'link_settings': {
121 'libraries': [ 125 'libraries': [
122 '-landroid', 126 '-landroid',
123 '-ljnigraphics', 127 '-ljnigraphics',
124 ], 128 ],
(...skipping 11 matching lines...) Expand all
136 'destination': '<(chrome_android_pak_output_folder)', 140 'destination': '<(chrome_android_pak_output_folder)',
137 'files': [ 141 'files': [
138 '<@(chrome_android_pak_input_resources)', 142 '<@(chrome_android_pak_input_resources)',
139 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', 143 '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
140 ], 144 ],
141 } 145 }
142 ], 146 ],
143 }, 147 },
144 ], 148 ],
145 } 149 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698