Revert "Ignore WebViewPlatformBridge apk when merging 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 183 matching lines @@
 
   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)
 
-  # TODO(sgurun) remove WebViewPlatformBridge.apk from this list crbug/580678
   dcmp = filecmp.dircmp(
       tmp_dir_64,
       tmp_dir_32,
-      ignore=['META-INF', 'AndroidManifest.xml', 'WebViewPlatformBridge.apk'])
+      ignore=['META-INF', 'AndroidManifest.xml'])
 
   diff_files = GetDiffFiles(dcmp, tmp_dir_32)
 
   # Check that diff_files match exactly those files we want to insert into
   # the 64-bit APK.
   CheckFilesExpected(diff_files, expected_files)
 
   RemoveMetafiles(tmp_apk)
 
   AddDiffFiles(diff_files, tmp_dir_32, tmp_apk, expected_files)
@@ skipping 44 matching lines @@
   except ApkMergeFailure as e:
     print e
     return 1
   finally:
     shutil.rmtree(tmp_dir)
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())