build/jni_generator.gypi - Issue 115103002: Android: sync up latest JNI generator changes from downstream.

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: build/jni_generator.gypi

Issue 115103002: Android: sync up latest JNI generator changes from downstream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Adds missing files Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: build/jni_generator.gypi

diff --git a/build/jni_generator.gypi b/build/jni_generator.gypi

index a6c8364d44caae14e8b3e9739ba8a46c48c53247..ddaad0114b85d149b9e5370df84c27d3ae4158b0 100644

--- a/build/jni_generator.gypi

+++ b/build/jni_generator.gypi

@@ -32,6 +32,10 @@

'jni_generator': '<(DEPTH)/base/android/jni_generator/jni_generator.py',

'jni_generator_jarjar_file%': '',

'jni_generator_ptr_type%': 'int',

+ # A comma separated string of include files.

+ 'jni_generator_includes%': (

+ 'base/android/jni_generator/jni_generator_helper.h'

+ ),

'rules': [

{

@@ -49,6 +53,8 @@

'<(RULE_INPUT_PATH)',

'--output_dir',

'<(SHARED_INTERMEDIATE_DIR)/<(jni_gen_package)/jni',

+ '--includes',

+ '<(jni_generator_includes)',

'--optimize_generation',

'<(optimize_jni_generation)',

'--jarjar',