build/java.gypi - Issue 10831227: Make jars build from a single ant .xml template

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 10831227: Make jars build from a single ant .xml template (Closed) Base URL: http://git.chromium.org/chromium/src.git@ant_aidl

Patch Set: Created 8 years, 4 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 c586399095158c04301bd3591fc5567400cdecb4..ef452f4c0e03084fe667354199fdb1c83496bc49 100644

--- a/build/java.gypi

+++ b/build/java.gypi

@@ -44,7 +44,6 @@

'inputs': [

'android/ant/common.xml',

'android/ant/chromium-jars.xml',

- '<(java_in_dir)/<(package_name).xml',

'<!@(find <(java_in_dir) -name "*.java")',

'>@(input_jars_paths)',

@@ -55,14 +54,16 @@

'ant',

'-DPRODUCT_DIR=<(ant_build_out)',

'-DPACKAGE_NAME=<(package_name)',

+ '-DINPUT_JARS_PATHS=>(input_jars_paths)',

'-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',

'-DANDROID_SDK=<(android_sdk)',

'-DANDROID_SDK_ROOT=<(android_sdk_root)',

'-DANDROID_SDK_TOOLS=<(android_sdk_tools)',

'-DANDROID_SDK_VERSION=<(android_sdk_version)',

'-DANDROID_TOOLCHAIN=<(android_toolchain)',

+ '-Dbasedir=<(java_in_dir)',

Yaron 2012/08/09 17:49:36 Where is this used?

'-buildfile',

- '<(java_in_dir)/<(package_name).xml',

+ '<(DEPTH)/build/android/ant/chromium-jars.xml'

]

« no previous file with comments | « build/android/ant/chromium-jars.xml ('k') | chrome/android/java/chrome.xml » ('j') | no next file with comments »