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

Unified Diff: build/android/gyp/javac.py

Issue 197213006: android: Pass list of java files as command line, instead of through a file list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 | « no previous file | build/java.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/gyp/javac.py
diff --git a/build/android/gyp/javac.py b/build/android/gyp/javac.py
index 707ba8efdafed4a2fe63a435c15a66d6877c9cd0..f61d2124f83c7abee97192dfb2bf553f84832c24 100755
--- a/build/android/gyp/javac.py
+++ b/build/android/gyp/javac.py
@@ -13,12 +13,11 @@ from util import build_utils
from util import md5_check
-def DoJavac(options):
+def DoJavac(options, args):
output_dir = options.output_dir
src_gendirs = build_utils.ParseGypList(options.src_gendirs)
- java_files = (open(options.src_filelist).read().splitlines() +
- build_utils.FindInDirectories(src_gendirs, '*.java'))
+ java_files = args + build_utils.FindInDirectories(src_gendirs, '*.java')
if options.javac_includes:
javac_includes = build_utils.ParseGypList(options.javac_includes)
filtered_java_files = []
@@ -77,7 +76,6 @@ def DoJavac(options):
def main(argv):
parser = optparse.OptionParser()
- parser.add_option('--src-filelist', help='File list containing java files.')
parser.add_option('--src-gendirs',
help='Directories containing generated java files.')
parser.add_option('--javac-includes',
@@ -93,9 +91,9 @@ def main(argv):
# TODO(newt): remove this once http://crbug.com/177552 is fixed in ninja.
parser.add_option('--ignore', help='Ignored.')
- options, _ = parser.parse_args()
+ options, args = parser.parse_args()
- DoJavac(options)
+ DoJavac(options, args)
if options.stamp:
build_utils.Touch(options.stamp)
« no previous file with comments | « no previous file | build/java.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698