Upstream Android Geolocation

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index 99d6548f598f23b94f91272302e7da1ceb683268..19f7cac25c614fc54a63cdb7c50935257c3b93c8 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -331,10 +331,14 @@
     'browser/geolocation/gps_location_provider_linux.h',
     'browser/geolocation/libgps_wrapper_linux.cc',
     'browser/geolocation/libgps_wrapper_linux.h',
+    'browser/geolocation/location_api_adapter_android.cc',
+    'browser/geolocation/location_api_adapter_android.h',
     'browser/geolocation/location_arbitrator.cc',
     'browser/geolocation/location_arbitrator.h',
     'browser/geolocation/location_provider.cc',
     'browser/geolocation/location_provider.h',
+    'browser/geolocation/location_provider_android.cc',
+    'browser/geolocation/location_provider_android.h',
     'browser/geolocation/network_location_provider.cc',
     'browser/geolocation/network_location_provider.h',
     'browser/geolocation/network_location_request.cc',
@@ -808,6 +812,21 @@
       ],
       'dependencies': [
         '../media/media.gyp:media',
+        'content.gyp:content_jni_headers',
+        'content.gyp:content_java',
+        'content.gyp:content_public_java',
+      ],
+      'sources!': [
+        # A main loop would be handled in Java.
+        'browser/browser_main_loop.cc',
+        'browser/browser_main_loop.h',
+        'browser/geolocation/network_location_provider.cc',
+        'browser/geolocation/network_location_provider.h',
+        'browser/geolocation/network_location_request.cc',
+        'browser/geolocation/network_location_request.h',
+      ],
+      'include_dirs': [
+        '<(SHARED_INTERMEDIATE_DIR)/content',
       ],
     }],
     ['OS=="mac"', {