Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Side by Side Diff: content/content_browser.gypi

Issue 10209003: Upstream Android Geolocation (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address Yaron's concerns. Still need to resolve Java locations. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 'browser/debugger/devtools_resources.gyp:devtools_resources', 7 'browser/debugger/devtools_resources.gyp:devtools_resources',
8 '../base/base.gyp:base_static', 8 '../base/base.gyp:base_static',
9 '../crypto/crypto.gyp:crypto', 9 '../crypto/crypto.gyp:crypto',
10 '../net/net.gyp:http_server', 10 '../net/net.gyp:http_server',
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 'browser/geolocation/geolocation.cc', 324 'browser/geolocation/geolocation.cc',
325 'browser/geolocation/geolocation_dispatcher_host.cc', 325 'browser/geolocation/geolocation_dispatcher_host.cc',
326 'browser/geolocation/geolocation_dispatcher_host.h', 326 'browser/geolocation/geolocation_dispatcher_host.h',
327 'browser/geolocation/geolocation_observer.h', 327 'browser/geolocation/geolocation_observer.h',
328 'browser/geolocation/geolocation_provider.cc', 328 'browser/geolocation/geolocation_provider.cc',
329 'browser/geolocation/geolocation_provider.h', 329 'browser/geolocation/geolocation_provider.h',
330 'browser/geolocation/gps_location_provider_linux.cc', 330 'browser/geolocation/gps_location_provider_linux.cc',
331 'browser/geolocation/gps_location_provider_linux.h', 331 'browser/geolocation/gps_location_provider_linux.h',
332 'browser/geolocation/libgps_wrapper_linux.cc', 332 'browser/geolocation/libgps_wrapper_linux.cc',
333 'browser/geolocation/libgps_wrapper_linux.h', 333 'browser/geolocation/libgps_wrapper_linux.h',
334 'browser/geolocation/location_api_adapter_android.cc',
335 'browser/geolocation/location_api_adapter_android.h',
334 'browser/geolocation/location_arbitrator.cc', 336 'browser/geolocation/location_arbitrator.cc',
335 'browser/geolocation/location_arbitrator.h', 337 'browser/geolocation/location_arbitrator.h',
336 'browser/geolocation/location_provider.cc', 338 'browser/geolocation/location_provider.cc',
337 'browser/geolocation/location_provider.h', 339 'browser/geolocation/location_provider.h',
340 'browser/geolocation/location_provider_android.cc',
341 'browser/geolocation/location_provider_android.h',
338 'browser/geolocation/network_location_provider.cc', 342 'browser/geolocation/network_location_provider.cc',
339 'browser/geolocation/network_location_provider.h', 343 'browser/geolocation/network_location_provider.h',
340 'browser/geolocation/network_location_request.cc', 344 'browser/geolocation/network_location_request.cc',
341 'browser/geolocation/network_location_request.h', 345 'browser/geolocation/network_location_request.h',
342 'browser/geolocation/osx_wifi.h', 346 'browser/geolocation/osx_wifi.h',
343 'browser/geolocation/wifi_data_provider_common.cc', 347 'browser/geolocation/wifi_data_provider_common.cc',
344 'browser/geolocation/wifi_data_provider_common.h', 348 'browser/geolocation/wifi_data_provider_common.h',
345 'browser/geolocation/wifi_data_provider_common_win.cc', 349 'browser/geolocation/wifi_data_provider_common_win.cc',
346 'browser/geolocation/wifi_data_provider_common_win.h', 350 'browser/geolocation/wifi_data_provider_common_win.h',
347 'browser/geolocation/wifi_data_provider_corewlan_mac.mm', 351 'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 '../build/linux/system.gyp:x11', 805 '../build/linux/system.gyp:x11',
802 '../dbus/dbus.gyp:dbus', 806 '../dbus/dbus.gyp:dbus',
803 ], 807 ],
804 }], 808 }],
805 ['OS=="android"', { 809 ['OS=="android"', {
806 'dependencies!': [ 810 'dependencies!': [
807 '../third_party/flac/flac.gyp:libflac', 811 '../third_party/flac/flac.gyp:libflac',
808 ], 812 ],
809 'dependencies': [ 813 'dependencies': [
810 '../media/media.gyp:media', 814 '../media/media.gyp:media',
815 'content.gyp:content_jni_headers',
816 'content.gyp:content_java',
817 'content.gyp:content_public_java',
818 ],
819 'sources!': [
820 # A main loop would be handled in Java.
821 'browser/browser_main_loop.cc',
822 'browser/browser_main_loop.h',
823 'browser/geolocation/network_location_provider.cc',
824 'browser/geolocation/network_location_provider.h',
825 'browser/geolocation/network_location_request.cc',
826 'browser/geolocation/network_location_request.h',
827 ],
828 'include_dirs': [
829 '<(SHARED_INTERMEDIATE_DIR)/content',
811 ], 830 ],
812 }], 831 }],
813 ['OS=="mac"', { 832 ['OS=="mac"', {
814 'sources': [ 833 'sources': [
815 # Build necessary Mozilla sources 834 # Build necessary Mozilla sources
816 '../third_party/mozilla/ComplexTextInputPanel.h', 835 '../third_party/mozilla/ComplexTextInputPanel.h',
817 '../third_party/mozilla/ComplexTextInputPanel.mm', 836 '../third_party/mozilla/ComplexTextInputPanel.mm',
818 '../third_party/mozilla/NSPasteboard+Utils.h', 837 '../third_party/mozilla/NSPasteboard+Utils.h',
819 '../third_party/mozilla/NSPasteboard+Utils.mm', 838 '../third_party/mozilla/NSPasteboard+Utils.mm',
820 '../third_party/mozilla/NSString+Utils.h', 839 '../third_party/mozilla/NSString+Utils.h',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
911 ], 930 ],
912 }], 931 }],
913 ['input_speech==0', { 932 ['input_speech==0', {
914 'sources/': [ 933 'sources/': [
915 ['exclude', '^browser/speech/'], 934 ['exclude', '^browser/speech/'],
916 ], 935 ],
917 }], 936 }],
918 ], 937 ],
919 } 938 }
920 939
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698