Upstreaming AndroidProtocolAdapter.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index eb493eb17322479d7913d2141d903aea8d8cd3eb..3d302d5d3669236e544606a01ec369da92a49d15 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,20 @@
           },
           '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',
+            'android_sdk%':

[Yaron, 2012/08/01 20:27:26]

Why is |android_sdk| being set here? It's now being passed in from gyp. Please
remove and let me know if it doesn't work.

[felipeg, 2012/08/02 13:20:38]

Done.

+              '<!(/bin/sh <(DEPTH)/build/android_jar_location.sh)',
+          },
+          'sources': [
+            '<(android_sdk)/android.jar',
+          ],
+          'includes': [ '../build/jar_file_jni_generator.gypi' ],
+        },
       ],
      },
     ],