content/content_browser.gypi - Issue 10209003: Upstream Android Geolocation

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_browser.gypi

Issue 10209003: Upstream Android Geolocation (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Add jni/ to allowed includes for check deps. Created 8 years, 8 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:

Index: content/content_browser.gypi

diff --git a/content/content_browser.gypi b/content/content_browser.gypi

index 0fe3caa6bc13012beaee454f485b9446f2b27acf..7dc037af3209e00105d9c3a8bee1d8e182f1aebe 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,17 @@

'dependencies': [

'../media/media.gyp:media',

+ 'content.gyp:content_jni_headers',

+ 'content.gyp:content_java',

+ ],

+ 'sources!': [

+ '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"', {