Make aidl.py create .srcjars with .java files in package-based directories

build/android/gyp/aidl.py

 #!/usr/bin/env python
 #
 # Copyright 2014 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.
 
 """Invokes Android's aidl
 """
 
 import optparse
 import os
+import re
 import sys
+import zipfile
 
 from util import build_utils
 
 
 def main(argv):
   option_parser = optparse.OptionParser()
   build_utils.AddDepfileOption(option_parser)
   option_parser.add_option('--aidl-path', help='Path to the aidl binary.')
   option_parser.add_option('--imports', help='Files to import.')
   option_parser.add_option('--includes',
@@ skipping 12 matching lines @@
       if options.includes is not None:
         aidl_cmd += [
           '-I' + s for s in build_utils.ParseGypList(options.includes)
         ]
       aidl_cmd += [
         f,
         output
       ]
       build_utils.CheckOutput(aidl_cmd)
 
-    build_utils.ZipDir(options.srcjar, temp_dir)
+    with zipfile.ZipFile(options.srcjar, 'w') as srcjar:

[Yaron, 2015/09/29 17:24:05]

As an alternative, how hard would it be to create them in the correct subdir?
The current setup also makes things like eclipse sad because the package doesn't
match the directory

[agrieve, 2015/09/29 17:36:56]

The .java files are deleted after the script runs, so this does fully fix the
issue.

[Yaron, 2015/09/29 17:48:00]

Right, thanks for clarifying the gyp vs gn thing. srcjars for eclipse classpath
seems like a legit fix

+      for path in build_utils.FindInDirectory(temp_dir, '*.java'):
+        with open(path) as fileobj:
+          data = fileobj.read()
+        pkg_name = re.search(r'^\s*package\s+(.*?)\s*;', data, re.M).group(1)
+        arcname = '%s/%s' % (pkg_name.replace('.', '/'), os.path.basename(path))
+        srcjar.writestr(arcname, data)
 
   if options.depfile:
     build_utils.WriteDepfile(
         options.depfile,
         build_utils.GetPythonDependencies())
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))