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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_android.gypi
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 1d4de15ed7691fec32de390668550222e769c113..ee82a100ff77862be5adc00644b4e252c9f7c048 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -16,6 +16,7 @@
'dependencies': [
'../base/base.gyp:base',
'chrome_android_core',
+ 'chrome_android_auxiliary',
'chromium_testshell_jni_headers',
'chrome.gyp:browser_ui',
],
@@ -23,7 +24,6 @@
# This file must always be included in the shared_library step to ensure
# JNI_OnLoad is exported.
'app/android/chrome_jni_onload.cc',
-
'android/testshell/chrome_main_delegate_testshell_android.cc',
'android/testshell/chrome_main_delegate_testshell_android.h',
"android/testshell/testshell_google_location_settings_helper.cc",
@@ -112,6 +112,8 @@
'sources': [
'app/android/chrome_android_initializer.cc',
'app/android/chrome_android_initializer.h',
+ 'app/android/chrome_data_reduction_proxy_android.cc',
+ 'app/android/chrome_data_reduction_proxy_android.h',
'app/android/chrome_main_delegate_android.cc',
'app/android/chrome_main_delegate_android.h',
'app/chrome_main_delegate.cc',
@@ -125,6 +127,19 @@
},
},
{
+ 'target_name': 'chrome_android_auxiliary',
+ 'type': 'static_library',
+ 'include_dirs': [
+ '<(SHARED_INTERMEDIATE_DIR)/chromium_testshell',
+ ],
+ 'sources': [
+ 'android/testshell/chrome_data_reduction_proxy_testshell_android.cc',
+ ],
+ 'dependencies': [
+ '../base/base.gyp:base',
+ ],
+ },
+ {
'target_name': 'chromium_testshell_paks',
'type': 'none',
'dependencies': [
« 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