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..8475b2069cb8bdf505074c1085dcb2cce15d4705 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',
           ],
@@ -5481,6 +5486,36 @@
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
+          'actions': [

[mkosiba (inactive), 2012/07/26 16:01:05]

this looks like a rule that could be shared. have you considered moving it under
base/ and including it from there?

[felipeg, 2012/07/27 13:32:30]

Done.

+            {
+              'action_name': 'generate_jni_headers_for_system_classes',
+              'variables' : {
+                'android_sdk%':
+                  '<!(if [ -f $ANDROID_SDK_ROOT/android.jar ]; then \
+                    /bin/echo -n $ANDROID_SDK_ROOT ; \
+                  else /bin/echo -n \
+                    $ANDROID_SDK_ROOT/platforms/android-${ANDROID_SDK_VERSION} ; \
+                  fi)',
+              },
+              'inputs': [
+                '../base/android/jni_generator/jni_generator.py',
+                '<(android_sdk)/android.jar',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/jni/input_stream_jni.h',
+              ],
+              'action': [
+                'python',
+                '../base/android/jni_generator/jni_generator.py',
+                '-j',
+                '<(android_sdk)/android.jar',
+                '--input_file',
+                'java/io/InputStream.class',
+                '--output_dir',
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/jni'
+              ],
+            },
+          ],
         },
       ],
      },