net/net.gyp - Issue 10798010: Uses gyp "rules" rather than "actions" templates for the JNI generator.

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: net/net.gyp

Issue 10798010: Uses gyp "rules" rather than "actions" templates for the JNI generator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Typo on content_jni.gypi Created 8 years, 5 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: net/net.gyp

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

index 632b4a41b5e88ffe0f6e06196e1a7540b408a401..ef1168948e467a1df5fe2159618c51981d17f3da 100644

--- a/net/net.gyp

+++ b/net/net.gyp

@@ -1901,17 +1901,13 @@

{

'target_name': 'net_jni_headers',

'type': 'none',

+ 'sources': [

+ 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',

+ 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',

+ 'android/java/src/org/chromium/net/ProxyChangeListener.java',

+ ],

'variables': {

- 'java_sources': [

- 'android/java/src/org/chromium/net/AndroidNetworkLibrary.java',

- 'android/java/src/org/chromium/net/NetworkChangeNotifier.java',

- 'android/java/src/org/chromium/net/ProxyChangeListener.java',

- ],

- 'jni_headers': [

- '<(SHARED_INTERMEDIATE_DIR)/net/jni/android_network_library_jni.h',

- '<(SHARED_INTERMEDIATE_DIR)/net/jni/network_change_notifier_jni.h',

- '<(SHARED_INTERMEDIATE_DIR)/net/jni/proxy_change_listener_jni.h',

- ],

+ 'jni_gen_dir': 'net',

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

« no previous file with comments | « net/android/network_library.cc ('k') | net/proxy/proxy_config_service_android.cc » ('j') | no next file with comments »