Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2797)

Unified Diff: build/java.gypi

Issue 193693002: android: Pass (non-generated) .java files via a gyp filelist to javac.py (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: addsrc Created 6 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gyp/javac.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 67ff12c0805626c39e3a62396786263789c41229..a68d6535a9ef8d3ea54f880c6ef40a86354c12f7 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -280,16 +280,12 @@
'action_name': 'javac_<(_target_name)',
'message': 'Compiling <(_target_name) java sources',
'variables': {
- 'all_src_dirs': [
- '>(java_in_dir)/src',
- '>@(additional_src_dirs)',
- '>@(generated_src_dirs)',
- ],
+ 'java_source_list': '>|(javasources.<(_target_name).gypcmd >!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java"))',
},
'inputs': [
'<(DEPTH)/build/android/gyp/util/build_utils.py',
'<(DEPTH)/build/android/gyp/javac.py',
- '>!@(find >(java_in_dir)/src >(additional_src_dirs) -name "*.java")',
+ '>(java_source_list)',
'>@(input_jars_paths)',
'>@(additional_input_paths)',
],
@@ -300,7 +296,8 @@
'python', '<(DEPTH)/build/android/gyp/javac.py',
'--output-dir=<(classes_dir)',
'--classpath=>(input_jars_paths)',
- '--src-dirs=>(all_src_dirs)',
+ '--src-filelist=>(java_source_list)',
+ '--src-gendirs=>(generated_src_dirs)',
'--javac-includes=<(javac_includes)',
'--chromium-code=<(chromium_code)',
'--stamp=<(compile_stamp)',
« no previous file with comments | « build/android/gyp/javac.py ('k') | build/java_apk.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698