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

Unified Diff: base/android/jni_generator/jni_registration_generator.py

Issue 2966293002: android: Fix input list for jni_registration_generator.py (Closed)
Patch Set: Created 3 years, 5 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/android/jni_generator/jni_registration_generator.py
diff --git a/base/android/jni_generator/jni_registration_generator.py b/base/android/jni_generator/jni_registration_generator.py
index a7ede2db968055153f752a5569e761f0c0e3a05b..4b51d091ce97d124e52f94b90e0e9bb96ae74929 100755
--- a/base/android/jni_generator/jni_registration_generator.py
+++ b/base/android/jni_generator/jni_registration_generator.py
@@ -161,19 +161,20 @@ def main(argv):
args = arg_parser.parse_args(build_utils.ExpandFileArgs(argv[1:]))
args.sources_files = build_utils.ParseGnList(args.sources_files)
- if args.sources_files:
- java_file_paths = []
- for f in args.sources_files:
- # java_file_paths stores each Java file path as a string.
- java_file_paths += build_utils.ReadSourcesList(f)
- else:
+ if not args.sources_files:
print '\nError: Must specify --sources_files.'
return 1
+
+ java_file_paths = []
+ for f in args.sources_files:
+ # java_file_paths stores each Java file path as a string.
+ java_file_paths += build_utils.ReadSourcesList(f)
output_file = args.output
GenerateJNIHeader(java_file_paths, output_file, args)
if args.depfile:
- build_utils.WriteDepfile(args.depfile, output_file)
+ build_utils.WriteDepfile(args.depfile, output_file,
+ args.sources_files + java_file_paths)
if __name__ == '__main__':
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698