Upstream Android Geolocation

content/content_browser.gypi

 # 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.
 
 {
   'dependencies': [
     'browser/debugger/devtools_resources.gyp:devtools_resources',
     '../base/base.gyp:base_static',
     '../crypto/crypto.gyp:crypto',
     '../net/net.gyp:http_server',
@@ skipping 290 matching lines @@
     'browser/gamepad/gamepad_standard_mappings.h',
     'browser/gamepad/gamepad_standard_mappings_linux.cc',
     'browser/gamepad/gamepad_standard_mappings_mac.mm',
     'browser/gamepad/platform_data_fetcher.h',
     'browser/gamepad/platform_data_fetcher_linux.cc',
     'browser/gamepad/platform_data_fetcher_linux.h',
     'browser/gamepad/platform_data_fetcher_mac.h',
     'browser/gamepad/platform_data_fetcher_mac.mm',
     'browser/gamepad/platform_data_fetcher_win.cc',
     'browser/gamepad/platform_data_fetcher_win.h',
+    'browser/geolocation/android_location_api_adapter.cc',
+    'browser/geolocation/android_location_api_adapter.h',
     'browser/geolocation/arbitrator_dependency_factory.cc',
     'browser/geolocation/arbitrator_dependency_factory.h',
     'browser/geolocation/core_location_data_provider_mac.h',
     'browser/geolocation/core_location_data_provider_mac.mm',
     'browser/geolocation/core_location_provider_mac.h',
     'browser/geolocation/core_location_provider_mac.mm',
     'browser/geolocation/device_data_provider.cc',
     'browser/geolocation/device_data_provider.h',
     'browser/geolocation/empty_device_data_provider.cc',
     'browser/geolocation/empty_device_data_provider.h',
     'browser/geolocation/geolocation_dispatcher_host.cc',
     'browser/geolocation/geolocation_dispatcher_host.h',
     'browser/geolocation/geolocation_observer.h',
     'browser/geolocation/geolocation_provider.cc',
     'browser/geolocation/geolocation_provider.h',
     'browser/geolocation/gps_location_provider_linux.cc',
     'browser/geolocation/gps_location_provider_linux.h',
     'browser/geolocation/libgps_wrapper_linux.cc',
     'browser/geolocation/libgps_wrapper_linux.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',
     'browser/geolocation/network_location_request.h',
     'browser/geolocation/osx_wifi.h',
     'browser/geolocation/wifi_data_provider_common.cc',
     'browser/geolocation/wifi_data_provider_common.h',
     'browser/geolocation/wifi_data_provider_common_win.cc',
     'browser/geolocation/wifi_data_provider_common_win.h',
     'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
@@ skipping 450 matching lines @@
         '../build/linux/system.gyp:fontconfig',
         '../build/linux/system.gyp:x11',
         '../dbus/dbus.gyp:dbus',
       ],
     }],
     ['OS=="android"', {
       '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',
+      ],
+      'dependencies': [
+        'content.gyp:content_jni_headers',
+        'content.gyp:content_java',
       ],
       'dependencies!': [
         '../third_party/flac/flac.gyp:libflac',
-      ]}],
+      ],
+    }, { # OS!="android"

[Yaron, 2012/04/24 17:10:23]

This is unnecessary as files with _android are omitted from other builds. See
build/filename_rules.gypi

[John Knottenbelt, 2012/04/25 15:25:37]

Right you are -- although filename_rules.gypi won't cover
browser/geolocation/android_location_api_adapter.cc because it's not in android/
and it doesn't end in _android. 

Do you think that moving them to android/ makes most sense?

On 2012/04/24 17:10:23, Yaron wrote:

[Yaron, 2012/04/25 17:26:09]

I don't think it's necessary. Either rename it location_api_adapter_android or
add "android_*" to android-only builds.

[John Knottenbelt, 2012/04/26 15:14:50]

Renamed to location_api_adapter_android

On 2012/04/25 17:26:09, Yaron wrote:

+      'sources!': [
+        'browser/geolocation/android_location_api_adapter.cc',
+        'browser/geolocation/android_location_api_adapter.h',
+        'browser/geolocation/location_provider_android.cc',
+        'browser/geolocation/location_provider_android.h',
+      ],
+    }],
     ['OS=="mac"', {
       'sources': [
         # Build necessary Mozilla sources
         '../third_party/mozilla/ComplexTextInputPanel.h',
         '../third_party/mozilla/ComplexTextInputPanel.mm',
         '../third_party/mozilla/NSPasteboard+Utils.h',
         '../third_party/mozilla/NSPasteboard+Utils.mm',
         '../third_party/mozilla/NSString+Utils.h',
         '../third_party/mozilla/NSString+Utils.mm',
         '../third_party/mozilla/NSURL+Utils.h',
@@ skipping 88 matching lines @@
       ],
     }],
     ['input_speech==0', {
       'sources/': [
         ['exclude', '^browser/speech/'],
       ],
     }],
   ],
 }