commit e13e65c4798ebe4ae5439db97b271c30d7d2bb6f
author Geoffrey Martin-Noble <gcmn@google.com> Tue Oct 26 20:23:11 2021 -0700
committer GitHub <noreply@github.com> Tue Oct 26 23:23:11 2021 -0400
tree 2f57289bdc97f7081e451cf45b3cb1a56d10f8f6
parent d89a5af0cfcf827046998889092130df02dd859d

Clean up run_binary_test on android (#7466)

build_tools/cmake/iree_run_binary_test.cmake

diff --git a/build_tools/cmake/iree_run_binary_test.cmake b/build_tools/cmake/iree_run_binary_test.cmake
index c233760..5d68900 100644
--- a/build_tools/cmake/iree_run_binary_test.cmake
+++ b/build_tools/cmake/iree_run_binary_test.cmake
@@ -74,8 +74,7 @@
   endif()
 
   if(ANDROID)
-    set(_ANDROID_REL_DIR "${_PACKAGE_PATH}/${_RULE_NAME}")
-    set(_ANDROID_ABS_DIR "/data/local/tmp/${_ANDROID_REL_DIR}")
+    set(_ANDROID_ABS_DIR "/data/local/tmp/${_PACKAGE_PATH}/${_RULE_NAME}")
   endif()
 
   if (DEFINED _RULE_TEST_INPUT_FILE_ARG)
@@ -92,9 +91,6 @@
   string(REGEX REPLACE "^::" "${_PACKAGE_NS}::" _TEST_BINARY_TARGET ${_RULE_TEST_BINARY})
 
   if(ANDROID)
-    set(_ANDROID_REL_DIR "${_PACKAGE_PATH}/${_RULE_NAME}")
-    set(_ANDROID_ABS_DIR "/data/local/tmp/${_ANDROID_REL_DIR}")
-
     # Define a custom target for pushing and running the test on Android device.
     set(_TEST_NAME ${_TEST_NAME}_on_android_device)
     add_test(
@@ -102,7 +98,7 @@
         ${_TEST_NAME}
       COMMAND
         "${CMAKE_SOURCE_DIR}/build_tools/cmake/run_android_test.${IREE_HOST_SCRIPT_EXT}"
-        "${_ANDROID_REL_DIR}/$<TARGET_FILE_NAME:${_TEST_BINARY_TARGET}>"
+        "${_ANDROID_ABS_DIR}/$<TARGET_FILE_NAME:${_TEST_BINARY_TARGET}>"
         ${_RULE_ARGS}
     )
     # Use environment variables to instruct the script to push artifacts