content/content.gyp - 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.gyp

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, 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:

View side-by-side diff with in-line comments

Download patch

Index: content/content.gyp

diff --git a/content/content.gyp b/content/content.gyp

index 6632f6d5af4b23d0cfa139864f06e19673ac44f7..e4d5f1775fbe7e079ffd1a68df243a5c2f6d6c9f 100644

--- a/content/content.gyp

+++ b/content/content.gyp

@@ -200,10 +200,35 @@

['OS == "android"', {

'targets': [

{

+ 'target_name': 'content_jni_headers',

+ 'type': 'none',

+ 'variables': {

+ 'java_sources': [

+ '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/android/java',

+ },

+ 'dependencies': [

+ '../base/base.gyp:base_java',

+ ],

+ 'includes': [ '../build/java.gypi' ],

+ },

+ {

+ 'target_name': 'content_public_java',

+ 'type': 'none',

+ 'variables': {

+ 'package_name': 'content_public',

'java_in_dir': '../content/public/android/java',

'includes': [ '../build/java.gypi' ],

« no previous file with comments | « content/browser/geolocation/location_provider_android.cc ('k') | content/content_browser.gypi » ('j') | content/public/android/java/content.xml » ('J')