Add --build_dir arg to build_aar.py

tools_webrtc/android/build_aar.py

 #!/usr/bin/env python
 
 # Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
@@ skipping 28 matching lines @@
 JAR_FILE = 'lib.java/webrtc/sdk/android/libwebrtc.jar'
 MANIFEST_FILE = 'webrtc/sdk/android/AndroidManifest.xml'
 TARGETS = [
   'webrtc/sdk/android:libwebrtc',
   'webrtc/sdk/android:libjingle_peerconnection_so',
 ]
 
 
 def _ParseArgs():
   parser = argparse.ArgumentParser(description='libwebrtc.aar generator.')
+  parser.add_argument('--build-dir',
+      help='Build dir. By default will create and use temporary dir.')
   parser.add_argument('--output', default='libwebrtc.aar',
       help='Output file of the script.')
   parser.add_argument('--arch', default=DEFAULT_ARCHS, nargs='*',
       help='Architectures to build. Defaults to %(default)s.')
   parser.add_argument('--use-goma', action='store_true', default=False,
       help='Use goma.')
   parser.add_argument('--verbose', action='store_true', default=False,
       help='Debug logging.')
   parser.add_argument('--extra-gn-args', default=[], nargs='*',
       help='Additional GN args to be used during Ninja generation.')
@@ skipping 17 matching lines @@
 def _EncodeForGN(value):
   """Encodes value as a GN literal."""
   if type(value) is str:
     return '"' + value + '"'
   elif type(value) is bool:
     return repr(value).lower()
   else:
     return repr(value)
 
 
 def _GetOutputDirectory(tmp_dir, arch):

[sakal, 2017/08/31 10:29:42]

nit: I think we should rename rest of the tmp_dir references as well.

   """Returns the GN output directory for the target architecture."""
   return os.path.join(tmp_dir, arch)
 
 
 def _GetTargetCpu(arch):
   """Returns target_cpu for the GN build with the given architecture."""
   if arch in ['armeabi', 'armeabi-v7a']:
     return 'arm'
   elif arch == 'arm64-v8a':
     return 'arm64'
@@ skipping 58 matching lines @@
   abi_dir = os.path.join('jni', arch)
   for so_file in NEEDED_SO_FILES:
     aar_file.write(os.path.join(output_directory, so_file),
                    os.path.join(abi_dir, so_file))
 
 
 def main():
   args = _ParseArgs()
   logging.basicConfig(level=logging.DEBUG if args.verbose else logging.INFO)
 
-  tmp_dir = tempfile.mkdtemp()
+  build_dir = args.build_dir if args.build_dir else tempfile.mkdtemp()
 
   for arch in args.arch:
-    Build(tmp_dir, arch, args.use_goma, args.extra_gn_args)
+    Build(build_dir, arch, args.use_goma, args.extra_gn_args)
 
   with zipfile.ZipFile(args.output, 'w') as aar_file:
     # Architecture doesn't matter here, arbitrarily using the first one.
-    CollectCommon(aar_file, tmp_dir, args.arch[0])
+    CollectCommon(aar_file, build_dir, args.arch[0])
     for arch in args.arch:
-      Collect(aar_file, tmp_dir, arch)
+      Collect(aar_file, build_dir, arch)
 
-  shutil.rmtree(tmp_dir, True)
+  if not args.build_dir:
+    shutil.rmtree(build_dir, True)
 
 
 if __name__ == '__main__':
   sys.exit(main())