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

Unified Diff: chrome/chrome_browser.gypi

Issue 10832034: Upstreaming AndroidProtocolAdapter. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index eb493eb17322479d7913d2141d903aea8d8cd3eb..3221006cc395bb9866832ac71a30cf6f3b414165 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -106,6 +106,10 @@
'browser/accessibility/invert_bubble_prefs.h',
'browser/alternate_nav_url_fetcher.cc',
'browser/alternate_nav_url_fetcher.h',
+ 'browser/android/android_protocol_adapter.cc',
+ 'browser/android/android_protocol_adapter.h',
+ 'browser/android/android_stream_reader_url_request_job.cc',
+ 'browser/android/android_stream_reader_url_request_job.h',
'browser/android/chrome_startup_flags.cc',
'browser/android/chrome_startup_flags.h',
'browser/android/intent_helper.cc',
@@ -5474,6 +5478,7 @@
'target_name': 'chrome_browser_jni_headers',
'type': 'none',
'sources': [
+ 'android/java/src/org/chromium/chrome/browser/AndroidProtocolAdapter.java',
'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
],
@@ -5482,6 +5487,18 @@
},
'includes': [ '../build/jni_generator.gypi' ],
},
+ {
+ 'target_name': 'android_jar_jni_headers',
+ 'type': 'none',
+ 'variables': {
+ 'jni_gen_dir': 'chrome',
+ 'input_java_class': 'java/io/InputStream.class',
+ },
+ 'sources': [
+ '<(android_sdk)/android.jar',
Yaron 2012/08/02 15:17:11 I think that sources should really be the set of c
+ ],
+ 'includes': [ '../build/jar_file_jni_generator.gypi' ],
+ },
],
},
],

Powered by Google App Engine
This is Rietveld 408576698