[Android] Add PIE support for ICS devices.

build/android/pylib/device/device_utils_test.py

 #!/usr/bin/env python
 # 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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=C0321
@@ skipping 579 matching lines @@
       self.assertEquals(
           [payload],
           self.device.RunShellCommand(['echo', payload], as_root=True))
 
   def testRunShellCommand_withSu(self):
     with self.assertCalls(
         (self.call.device.NeedsSU(), True),
         (self.call.adb.Shell("su -c sh -c 'setprop service.adb.root 0'"), '')):
       self.device.RunShellCommand('setprop service.adb.root 0', as_root=True)
 
+  def testRunShellCommand_withPie_ics(self):
+    with self.assertCalls(
+        (self.call.device.build_version_sdk(),

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

These calls to build_version_sdk() are why we need the changes to mock_calls.

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

Acknowledged.

+         constants.ANDROID_SDK_VERSION_CODES.ICE_CREAM_SANDWICH),
+        (self.call.device.GetDevicePieWrapper(), '/path/to/run_pie'),
+        (self.call.adb.Shell('/path/to/run_pie md5sum /foo/bar'),
+         '0123456789abcdef0123456789abcdef')):
+      self.device.RunShellCommand('md5sum /foo/bar', with_pie=True)
+
+  def testRunShellCommand_withPie_jb(self):
+    with self.assertCalls(
+        (self.call.device.build_version_sdk(),
+         constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN),
+        (self.call.adb.Shell('md5sum /foo/bar'),
+         '0123456789abcdef0123456789abcdef')):
+      self.device.RunShellCommand('md5sum /foo/bar', with_pie=True)
+
   def testRunShellCommand_manyLines(self):
     cmd = 'ls /some/path'
     with self.assertCall(self.call.adb.Shell(cmd), 'file1\nfile2\nfile3\n'):
       self.assertEquals(['file1', 'file2', 'file3'],
                         self.device.RunShellCommand(cmd))
 
   def testRunShellCommand_singleLine_success(self):
     cmd = 'echo $VALUE'
     with self.assertCall(self.call.adb.Shell(cmd), 'some value\n'):
       self.assertEquals('some value',
@@ skipping 39 matching lines @@
         self.device.RunShellCommand(cmd, check_return=True)
 
   def testRunShellCommand_checkReturn_disabled(self):
     cmd = 'ls /root'
     output = 'opendir failed, Permission denied\n'
     with self.assertCall(self.call.adb.Shell(cmd), self.ShellError(output)):
       self.assertEquals([output.rstrip()],
                         self.device.RunShellCommand(cmd, check_return=False))
 
 
+class DeviceUtilsGetDevicePieWrapper(DeviceUtilsNewImplTest):
+
+  def testGetDevicePieWrapper_jb(self):
+    with self.assertCall(
+        self.call.device.build_version_sdk(),
+        constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN):
+      self.assertEqual('', self.device.GetDevicePieWrapper())
+
+  def testGetDevicePieWrapper_ics(self):
+    with mock.patch('pylib.constants.GetOutDirectory',
+                    mock.Mock(return_value='/foo/bar')), (
+         mock.patch('os.path.exists', return_value=True)):

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

you could also place these in the list of assertCalls as:

  (mock.call.pylib.constants.GetOutDirectory(), '/foo/bar'),
  (mock.call.os.path.exists(mock.ANY), True),

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

Oh, nice. I like that better.

+      with self.assertCalls(
+          (self.call.device.build_version_sdk(),
+           constants.ANDROID_SDK_VERSION_CODES.ICE_CREAM_SANDWICH),
+          (self.call.adb.Push(mock.ANY, mock.ANY),
+           '')):
+        self.assertNotEqual('', self.device.GetDevicePieWrapper())
+
+
 @mock.patch('time.sleep', mock.Mock())
 class DeviceUtilsKillAllTest(DeviceUtilsNewImplTest):
 
   def testKillAll_noMatchingProcesses(self):
     with self.assertCall(self.call.adb.Shell('ps'),
         'USER   PID   PPID  VSIZE  RSS   WCHAN    PC       NAME\n'):
       with self.assertRaises(device_errors.CommandFailedError):
         self.device.KillAll('test_process')
 
   def testKillAll_nonblocking(self):
@@ skipping 786 matching lines @@
       self.assertTrue(
           isinstance(device, device_utils.DeviceUtils)
           and serial == str(device),
           'Expected a DeviceUtils object with serial %s' % serial)
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)