Upstream Android Geolocation

content/content.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,  # Use higher warning level.
     'directxsdk_exists': '<!(python <(DEPTH)/build/dir_exists.py ../third_party/directxsdk)',
   },
   'includes': [
@@ skipping 182 matching lines @@
       {'target_name': 'content_worker',
        'type': 'none',
        'dependencies': ['content'],
       },
      ],
     },
    ],
    ['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',
          'variables': {
            'package_name': 'content',
            'java_in_dir': '../content/public/android/java',
          },
+         'dependencies': [
+            '../base/base.gyp:base_java',
+          ],
          'includes': [ '../build/java.gypi' ],
        },
      ],
    }],  # OS == "android"
   ],
 }