Android content shell bringup.

content/content.gyp

Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index b05a6e789df44be4772f57bc2d3285c51e5ea38b..ce006f157e45a1229c281d3333d47213ecf1138b 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -200,30 +200,20 @@
    ['OS == "android"', {
      'targets': [
        {
-         'target_name': 'content_jni_headers',
-         'type': 'none',
-         'variables': {
-           'java_sources': [
-              '../content/public/android/java/org/chromium/content/browser/LocationProvider.java',
-           ],
-           'jni_headers': [
-              '<(SHARED_INTERMEDIATE_DIR)/content/jni/location_provider_jni.h',
-           ],
-         },
-         'includes': [ '../build/jni_generator.gypi' ],
-       },
-       {
          'target_name': 'content_java',
          'type': 'none',
+         'dependencies': ['../base/base.gyp:base_java'],
          'variables': {
            'package_name': 'content',
            'java_in_dir': '../content/public/android/java',
          },
-         'dependencies': [
-            '../base/base.gyp:base_java',
-          ],
          'includes': [ '../build/java.gypi' ],
        },
+       {
+         'target_name': 'content_jni_headers',
+         'type': 'none',
+         'includes': [ 'content_jni.gypi' ],
+       },
      ],
    }],  # OS == "android"
   ],