Merge branch 'master' into i7046-add-attach-memory-dump-test

DynamoRIO · Jan 22, 2025 · 6cded3f · 6cded3f
2 parents e1c8441 + 64f768e
commit 6cded3f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/make/utils_exposed.cmake b/make/utils_exposed.cmake
@@ -243,10 +243,11 @@ endfunction (DynamoRIO_get_target_path_for_execution)
 
 function (DynamoRIO_prefix_cmd_if_necessary cmd_out use_ats cmd_in)
   if (ANDROID)
+    set(script ${PROJECT_BINARY_DIR}/tools/run_on_android_device.sh)
     if (use_ats)
-      set(${cmd_out} "adb@shell@${cmd_in}${ARGN}" PARENT_SCOPE)
+      set(${cmd_out} "${script}@${cmd_in}${ARGN}" PARENT_SCOPE)
     else ()
-      set(${cmd_out} adb shell ${cmd_in} ${ARGN} PARENT_SCOPE)
+      set(${cmd_out} ${script} ${cmd_in} ${ARGN} PARENT_SCOPE)
     endif ()
   elseif (CMAKE_CROSSCOMPILING AND DEFINED CMAKE_FIND_ROOT_PATH AND QEMU_BINARY)
     if (use_ats)

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -228,3 +228,7 @@ DR_install(FILES
   "${CMAKE_CURRENT_SOURCE_DIR}/windbg-scripts/load_syms${SYMSFX}"
   DESTINATION "${INSTALL_BIN}"
   RENAME "load_syms${SYMSFX}.txt")
+
+if (ANDROID)
+  configure_file(run_on_android_device.sh.in run_on_android_device.sh @ONLY)
+endif ()
diff --git a/tools/run_on_android_device.sh.in b/tools/run_on_android_device.sh.in
@@ -0,0 +1,6 @@
+#!/usr/bin/sh
+
+# Used to run a command on an Android device when building for Android
+# while preserving the argument quoting used on the host.
+
+@ADB@ shell $(printf "'%s' "  "$@")