Add support for 64-bit architectures in 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 16 matching lines @@
 import argparse
 import logging
 import os
 import shutil
 import subprocess
 import sys
 import tempfile
 import zipfile
 
 
-DEFAULT_ARCHS = ['armeabi-v7a', 'x86']
+DEFAULT_ARCHS = ['armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64']
 NEEDED_SO_FILES = ['libjingle_peerconnection_so.so']
 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():
@@ skipping 37 matching lines @@
 
 def _GetOutputDirectory(tmp_dir, arch):
   """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'
   elif arch == 'x86':
     return 'x86'
+  elif arch == 'x86_64':
+    return 'x64'
   else:
     raise Exception('Unknown arch: ' + arch)
 
 
 def _GetArmVersion(arch):
   """Returns arm_version for the GN build with the given architecture."""
   if arch == 'armeabi':
     return 6
   elif arch == 'armeabi-v7a':
     return 7
-  elif arch == 'x86':
+  elif arch in ['arm64-v8a', 'x86', 'x86_64']:
     return None
   else:
     raise Exception('Unknown arch: ' + arch)
 
 
 def Build(tmp_dir, arch, use_goma, extra_gn_args):
   """Generates target architecture using GN and builds it using ninja."""
   logging.info('Building: %s', arch)
   output_directory = _GetOutputDirectory(tmp_dir, arch)
   gn_args = {
@@ skipping 49 matching lines @@
     # Architecture doesn't matter here, arbitrarily using the first one.
     CollectCommon(aar_file, tmp_dir, args.arch[0])
     for arch in args.arch:
       Collect(aar_file, tmp_dir, arch)
 
   shutil.rmtree(tmp_dir, True)
 
 
 if __name__ == '__main__':
   sys.exit(main())