[Android] Use CONFIGURATION_NAME-specific device folders

build/android/gyp/push_libraries.py

 #!/usr/bin/env python
 #
 # Copyright 2013 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.
 
 """Pushes native libraries to a device.
 
 """
 
@@ skipping 23 matching lines @@
     host_path = os.path.join(options.libraries_dir, lib)
 
     def Push():
       if needs_directory:
         adb.RunShellCommand('mkdir ' + options.device_dir)
         needs_directory[:] = [] # = False
       adb.PushIfNeeded(host_path, device_path)
 
     record_path = '%s.%s.push.md5.stamp' % (host_path, serial_number)
     md5_check.CallAndRecordIfStale(
-        Push, record_path=record_path, input_paths=[host_path])
+        Push,
+        record_path=record_path,
+        input_paths=[host_path],
+        input_strings=[device_path])
 
 
 def main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--libraries-dir',
       help='Directory that contains stripped libraries.')
   parser.add_option('--device-dir',
       help='Device directory to push the libraries to.')
   parser.add_option('--libraries-json',
       help='Path to the json list of native libraries.')
   parser.add_option('--stamp', help='Path to touch on success.')
   options, _ = parser.parse_args()
 
   required_options = ['libraries_dir', 'device_dir', 'libraries_json']
   build_utils.CheckOptions(options, parser, required=required_options)
 
   DoPush(options)
 
   if options.stamp:
     build_utils.Touch(options.stamp)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))