🐻 Fix ui_base_unittests on Android Swarming (adds missing data)

build/android/pylib/utils/isolator.py

 # 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.
 
 import fnmatch
 import glob
 import os
 import shutil
 import sys
 import tempfile
@@ skipping 134 matching lines @@
     excluded_paths = (
         x for y in deps_exclusion_list
         for x in glob.glob(
             os.path.abspath(os.path.join(self._isolate_deps_dir, y))))
     for p in excluded_paths:
       if os.path.isdir(p):
         shutil.rmtree(p)
       else:
         os.remove(p)
 
+  @classmethod
+  def _DestructiveMerge(cls, src, dest):
+    if os.path.exists(dest) and os.path.isdir(dest):
+      for p in os.listdir(src):
+        cls._DestructiveMerge(os.path.join(src, p), os.path.join(dest, p))
+      os.rmdir(src)
+    else:
+      shutil.move(src, dest)
+
+
   def MoveOutputDeps(self):
     """Moves files from the output directory to the top level of
       |self._isolate_deps_dir|.
 
     Moves pak files from the output directory to to <isolate_deps_dir>/paks
     Moves files from the product directory to <isolate_deps_dir>
     """
     # On Android, all pak files need to be in the top-level 'paks' directory.
     paks_dir = os.path.join(self._isolate_deps_dir, 'paks')
     os.mkdir(paks_dir)
 
     deps_out_dir = os.path.join(
         self._isolate_deps_dir,
         os.path.relpath(os.path.join(constants.GetOutDirectory(), os.pardir),
                         host_paths.DIR_SOURCE_ROOT))
     for root, _, filenames in os.walk(deps_out_dir):
       for filename in fnmatch.filter(filenames, '*.pak'):
         shutil.move(os.path.join(root, filename), paks_dir)
 
     # Move everything in PRODUCT_DIR to top level.
     deps_product_dir = os.path.join(
         deps_out_dir, os.path.basename(constants.GetOutDirectory()))
     if os.path.isdir(deps_product_dir):
       for p in os.listdir(deps_product_dir):
-        shutil.move(os.path.join(deps_product_dir, p), self._isolate_deps_dir)
+        Isolator._DestructiveMerge(os.path.join(deps_product_dir, p),
+                                   os.path.join(self._isolate_deps_dir, p))
       os.rmdir(deps_product_dir)
       os.rmdir(deps_out_dir)