build/java.gypi - Issue 12880007: Translate some ant to python

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/java.gypi

Issue 12880007: Translate some ant to python (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ant_split

Patch Set: Rebase Created 7 years, 9 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: build/java.gypi

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

index 1ab72c20b7f706d81981e8885fbf0ae258a984e4..6b0b9a500dd0bcd1764d8cf617e0b5590fbbb61b 100644

--- a/build/java.gypi

+++ b/build/java.gypi

@@ -56,7 +56,7 @@

'javac_includes': [],

'jar_name': '<(_target_name).jar',

'jar_path': '<(PRODUCT_DIR)/lib.java/<(jar_name)',

- 'excluded_classes': [ '*/R.class', '*/R##*.class' ],

+ 'jar_excluded_classes': [ '*/R.class', '*/R##*.class' ],

'additional_input_paths': [],

'generated_src_dirs': ['>@(generated_R_dirs)'],

'generated_R_dirs': [],

@@ -170,7 +170,7 @@

'message': 'Compiling <(_target_name) java sources',

'variables': {

'all_src_dirs': [

- '>@(java_in_dir)/src',

+ '>(java_in_dir)/src',

'>@(additional_src_dirs)',

'>@(generated_src_dirs)',

@@ -212,7 +212,7 @@

'python', '<(DEPTH)/build/android/jar.py',

'--classes-dir=<(classes_dir)',

'--jar-path=<(jar_path)',

- '--excluded-classes=<(excluded_classes)',

+ '--excluded-classes=<(jar_excluded_classes)',

# TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.

'--ignore=>!(echo \'>(_inputs)\' | md5sum)',

« no previous file with comments | « build/android/dex.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »