💥 Fail compile if dx has input paths which do not end with .jar

build/android/gyp/dex.py

 #!/usr/bin/env python
 #
 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import json
 import logging
 import optparse
 import os
 import sys
 import tempfile
 import zipfile
 
 from util import build_utils
 
 
+def _CheckFilePathEndsWithJar(parser, file_path):

[agrieve, 2016/07/19 00:00:21]

nit: Can you add a comment here saying that we perform this check because dx
doesn't do the right thing?

+  if not file_path.endswith(".jar"):
+    parser.error("%s does not end in .jar" % file_path)
+
+
+def _CheckFilePathsEndWithJar(parser, file_paths):
+  for file_path in file_paths:
+    _CheckFilePathEndsWithJar(parser, file_path)
+
+
 def _RemoveUnwantedFilesFromZip(dex_path):
   iz = zipfile.ZipFile(dex_path, 'r')
   tmp_dex_path = '%s.tmp.zip' % dex_path
   oz = zipfile.ZipFile(tmp_dex_path, 'w', zipfile.ZIP_DEFLATED)
   for i in iz.namelist():
     if i.endswith('.dex'):
       oz.writestr(i, iz.read(i))
   os.remove(dex_path)
   os.rename(tmp_dex_path, dex_path)
 
@@ skipping 46 matching lines @@
     options.multi_dex = multidex_config.get('enabled', False)
 
   if options.multi_dex and not options.main_dex_list_path:
     logging.warning('multidex cannot be enabled without --main-dex-list-path')
     options.multi_dex = False
   elif options.main_dex_list_path and not options.multi_dex:
     logging.warning('--main-dex-list-path is unused if multidex is not enabled')
 
   if options.inputs:
     options.inputs = build_utils.ParseGypList(options.inputs)
+    _CheckFilePathsEndWithJar(parser, options.inputs)
   if options.excluded_paths:
     options.excluded_paths = build_utils.ParseGypList(options.excluded_paths)
 
+  if (options.proguard_enabled_input_path):

[agrieve, 2016/07/19 00:00:21]

nit: drop the ()s

+    _CheckFilePathEndsWithJar(parser, options.proguard_enabled_input_path)
+  _CheckFilePathsEndWithJar(parser, paths)
+
   return options, paths
 
 
 def _AllSubpathsAreClassFiles(paths, changes):
   for path in paths:
     if any(not p.endswith('.class') for p in changes.IterChangedSubpaths(path)):
       return False
   return True
 
 
@@ skipping 125 matching lines @@
       options,
       input_paths=input_paths,
       input_strings=dex_cmd,
       output_paths=output_paths,
       force=force,
       pass_changes=True)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))