Fix Android unit tests failing when using a GN output directory of foo/

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 140 matching lines @@
 
     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),

[jbudorick, 2015/10/14 17:56:30]

Yeah, this will definitely break our GYP builds at least, hence the try job
failure.

-                        constants.DIR_SOURCE_ROOT))
+        os.path.relpath(constants.GetOutDirectory(), constants.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, constants.GetBuildType())
     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)
       os.rmdir(deps_product_dir)
       os.rmdir(deps_out_dir)