[Android] Fix device file push location

build/android/pylib/android_commands.py

 # Copyright (c) 2012 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.
 
 """Provides an interface to communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 
 import collections
@@ skipping 817 matching lines @@
 
       def HostHas(fname):
         return any(path in fname for path in host_files)
 
       device_hash_tuples = [h for h in device_hash_tuples if HostHas(h.path)]
 
     # Constructs the target device path from a given host path. Don't use when
     # only a single file is given as the base name given in device_path may
     # differ from that in host_path.
     def HostToDevicePath(host_file_path):
-      return os.path.join(os.path.dirname(device_path), os.path.relpath(
-          host_file_path, os.path.dirname(os.path.normpath(host_path))))
+      return os.path.join(device_path, os.path.relpath(
+          host_file_path, os.path.normpath(host_path)))
 
     device_hashes = [h.hash for h in device_hash_tuples]
     return [(t.path, HostToDevicePath(t.path) if os.path.isdir(host_path) else
              device_path)
             for t in host_hash_tuples if t.hash not in device_hashes]
 
   def PushIfNeeded(self, host_path, device_path):
     """Pushes |host_path| to |device_path|.
 
     Works for files and directories. This method skips copying any paths in
@@ skipping 695 matching lines @@
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()