build/java.gypi - Issue 306453003: Remove apk-codegen.xml

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 306453003: Remove apk-codegen.xml (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix proguard.txt Created 6 years, 7 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 8f61395cb9136566f6c7cde1f2dc5aa2c8aff3c4..ce778b1ae5197808f5bb8c653727acf288616869 100644

--- a/build/java.gypi

+++ b/build/java.gypi

@@ -156,8 +156,8 @@

'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml',

# Include the dependencies' res dirs so that references to

# resources in dependencies can be resolved.

- 'all_res_dirs': ['<@(res_input_dirs)',

- '>@(dependencies_res_input_dirs)',],

+ 'dependencies_res_dirs': ['<@(res_extra_dirs)',

+ '>@(dependencies_res_input_dirs)',],

# Write the inputs list to a file, so that its mtime is updated when

# the list of inputs changes.

'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))'

@@ -177,8 +177,8 @@

'--android-sdk', '<(android_sdk)',

'--android-sdk-tools', '<(android_sdk_tools)',

'--R-dir', '<(R_dir)',

- '--res-dirs', '>(all_res_dirs)',

- '--crunch-input-dir', '>(res_dir)',

+ '--dependencies-res-dirs', '>(dependencies_res_dirs)',

+ '--resource-dir', '<(res_dir)',

'--crunch-output-dir', '<(res_crunched_dir)',

'--android-manifest', '<(android_manifest)',

'--non-constant-id',

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