[Android] Support merging debug apks.

android_webview/tools/apk_merger.py

 #!/usr/bin/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.
 
 """ Merges a 64-bit and a 32-bit APK into a single APK
 
 """
 
 import os
@@ skipping 174 matching lines @@
         compress = False)
 
 
 def MergeApk(args, tmp_apk, tmp_dir_32, tmp_dir_64):
   # Expected files to copy from 32- to 64-bit APK together with an extra flag
   # setting the compression level of the file
   expected_files = {'snapshot_blob_32.bin': ['-0'],
                     'natives_blob_32.bin': ['-0'],
                     args.shared_library: []}
 
+  if args.debug:
+    expected_files['gdbserver'] = []
   if args.uncompress_shared_libraries:
     expected_files[args.shared_library] += ['-0']
 
   shutil.copyfile(args.apk_64bit, tmp_apk)
 
   # need to unpack APKs to compare their contents
   UnpackApk(args.apk_64bit, tmp_dir_64)
   UnpackApk(args.apk_32bit, tmp_dir_32)
 
   dcmp = filecmp.dircmp(
@@ skipping 21 matching lines @@
   parser.add_argument('--apk_64bit', type=os.path.abspath)
   parser.add_argument('--secondary_abi_out_dir', type=os.path.abspath)
   parser.add_argument('--out_apk', required=True, type=os.path.abspath)
   parser.add_argument('--zipalign_path', required=True, type=os.path.abspath)
   parser.add_argument('--keystore_path', required=True, type=os.path.abspath)
   parser.add_argument('--key_name', required=True)
   parser.add_argument('--key_password', required=True)
   parser.add_argument('--shared_library', required=True)
   parser.add_argument('--page-align-shared-libraries', action='store_true')
   parser.add_argument('--uncompress-shared-libraries', action='store_true')
+  parser.add_argument('--debug', action='store_true')
   args = parser.parse_args()
 
   tmp_dir = tempfile.mkdtemp()
   tmp_dir_64 = os.path.join(tmp_dir, '64_bit')
   tmp_dir_32 = os.path.join(tmp_dir, '32_bit')
   tmp_apk = os.path.join(tmp_dir, 'tmp.apk')
   signed_tmp_apk = os.path.join(tmp_dir, 'signed.apk')
   new_apk = args.out_apk
 
   try:
@@ skipping 16 matching lines @@
   except ApkMergeFailure as e:
     print e
     return 1
   finally:
     shutil.rmtree(tmp_dir)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())