commit 2eecdfaa81f3e610a9310ce942f3fdbde93bebc8
author Keun Soo Yim <yim@google.com> Fri Jul 29 11:48:37 2016 -0700
committer Keun Soo Yim <yim@google.com> Fri Jul 29 22:29:06 2016 +0000
tree 21f27620fcbb54505980473ec5d6110fdf659d14
parent f5cfa9d3fcc29bdd3dfa6a5b61d4935aa2c9c5cf

produce 32-bit vts agent for legacy devices

Change-Id: I5e4ab0a370b269778c3299b0122093407b0b8cca

utils/python/controllers/android_device.py

diff --git a/utils/python/controllers/android_device.py b/utils/python/controllers/android_device.py
index 289f763..b7241b8 100644
--- a/utils/python/controllers/android_device.py
+++ b/utils/python/controllers/android_device.py
@@ -580,12 +580,14 @@
             "rm -f /data/local/tmp/vts_driver_*",
             "rm -f /data/local/tmp/vts_agent_callback*"
         ]
-        kill_commands = ["killall vts_hal_agent", "killall fuzzer32",
-                         "killall fuzzer64", "killall vts_shell_driver32",
+        kill_commands = ["killall vts_hal_agent32", "killall vts_hal_agent64",
+                         "killall fuzzer32", "killall fuzzer64",
+                         "killall vts_shell_driver32",
                          "killall vts_shell_driver64"]
         cleanup_commands.extend(kill_commands)
         chmod_commands = [
-            "chmod 755 %s/64/vts_hal_agent" % DEFAULT_AGENT_BASE_DIR,
+            "chmod 755 %s/32/vts_hal_agent32" % DEFAULT_AGENT_BASE_DIR,
+            "chmod 755 %s/64/vts_hal_agent64" % DEFAULT_AGENT_BASE_DIR,
             "chmod 755 %s/32/fuzzer32" % DEFAULT_AGENT_BASE_DIR,
             "chmod 755 %s/64/fuzzer64" % DEFAULT_AGENT_BASE_DIR,
             "chmod 755 %s/32/vts_shell_driver32" % DEFAULT_AGENT_BASE_DIR,
@@ -601,7 +603,8 @@
                     e)
         vts_agent_log_path = os.path.join(self.log_path, "vts_agent.log")
         cmd = (
-            'adb -s {s} shell LD_LIBRARY_PATH={path}/64 {path}/64/vts_hal_agent'
+            'adb -s {s} shell LD_LIBRARY_PATH={path}/64 '
+            '{path}/64/vts_hal_agent64'
             ' {path}/32/fuzzer32 {path}/64/fuzzer64 {path}/spec'
             ' {path}/32/vts_shell_driver32 {path}/64/vts_shell_driver64 >> {log}'
         ).format(s=self.serial,