[Android] Add PIE support for ICS devices.

build/android/pylib/utils/md5sum.py

Index: build/android/pylib/utils/md5sum.py
diff --git a/build/android/pylib/utils/md5sum.py b/build/android/pylib/utils/md5sum.py
index 4d0d7038be4ae5602cd822bb66118a0de4390031..da3cd15c785b0da5a2382816078d6817f63fc7aa 100644
--- a/build/android/pylib/utils/md5sum.py
+++ b/build/android/pylib/utils/md5sum.py
@@ -19,7 +19,7 @@ MD5SUM_DEVICE_BIN_PATH = MD5SUM_DEVICE_LIB_PATH + 'md5sum_bin'
 
 MD5SUM_DEVICE_SCRIPT_FORMAT = (
     'test -f {path} -o -d {path} '
-    '&& LD_LIBRARY_PATH={md5sum_lib} {md5sum_bin} {path}')
+    '&& LD_LIBRARY_PATH={md5sum_lib} {device_pie_wrapper} {md5sum_bin} {path}')
 
 
 def CalculateHostMd5Sums(paths):
@@ -56,12 +56,15 @@ def CalculateDeviceMd5Sums(paths, device):
         MD5SUM_DEVICE_LIB_PATH)
 
   out = []
+
   with tempfile.NamedTemporaryFile() as md5sum_script_file:
     with device_temp_file.DeviceTempFile(
         device.adb) as md5sum_device_script_file:
+      device_pie_wrapper = device.GetDevicePieWrapper()
       md5sum_script = (
           MD5SUM_DEVICE_SCRIPT_FORMAT.format(
               path=p, md5sum_lib=MD5SUM_DEVICE_LIB_PATH,
+              device_pie_wrapper=device_pie_wrapper,
               md5sum_bin=MD5SUM_DEVICE_BIN_PATH)
           for p in paths)
       md5sum_script_file.write('; '.join(md5sum_script))
@@ -69,5 +72,5 @@ def CalculateDeviceMd5Sums(paths, device):
       device.adb.Push(md5sum_script_file.name, md5sum_device_script_file.name)
       out = device.RunShellCommand(['sh', md5sum_device_script_file.name])

[perezju, 2015/02/16 10:25:23]

while we are at it, could we remove the hand-rolled "write to script then run"
logic? This is now already done by RunShellCommand when necessary.

[jbudorick, 2015/02/17 15:15:10]

I'd like to do that, but I don't want to do so in this patch. The MD5 sum logic
is critical for the CQ, so I'd like to keep changes small and isolated.

[perezju, 2015/02/17 16:04:26]

Acknowledged. Maybe start a bug so that we don't forget?

 
-  return [HashAndPath(*l.split(None, 1)) for l in out]
+  return [HashAndPath(*l.split(None, 1)) for l in out if l]