Snap for 7357013 from 0f35caa8191635ace102f6d8c96318c5ed52dfe3 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-security-11.0.0_r71android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release

Change-Id: I07ef7b2a130bb703fdae4f73dc86f6f0166ab589

2 files changed, 18 insertions, 9 deletions

diff --git a/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh b/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh
index ffe2850..2dc64ca 100644
--- a/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh
+++ b/experiments/prepare_bazel_test_env/data/static/build/bazel/rules/cc_tf_test_launcher.sh
@@ -17,6 +17,11 @@ shift
 TEST_PATH=$1
 shift
 
+if [ $1 != "" ] && [ $1 == "--host" ]; then
+  HOST_ARGS=(-n --prioritize-host-config --skip-host-arch-check)
+  shift
+fi
+
 exec $TRADEFED_LAUNCHER template/atest_local_min \
     --template:map test=atest \
     --tests-dir "$TEST_PATH" \
@@ -27,7 +32,5 @@ exec $TRADEFED_LAUNCHER template/atest_local_min \
     --skip-loading-config-jar \
     --log-level-display VERBOSE \
     --log-level VERBOSE \
-    -n \
-    --prioritize-host-config \
-    --skip-host-arch-check \
+    "${HOST_ARGS[@]}" \
     "$@"
\ No newline at end of file
diff --git a/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template b/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template
index 4c7e3e0..6d4a026 100644
--- a/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template
+++ b/experiments/prepare_bazel_test_env/data/templates/platform_testing/tests/example/native/BUILD.bazel.template
@@ -25,18 +25,24 @@ _LIB_SRCS = glob([
     "{prebuilts_dir_name}/host/lib/**/*",
     "{prebuilts_dir_name}/host/lib64/**/*"
 ])
-_TESTCASE_SRCS = glob(
+_TESTCASE_HOST_SRCS = glob(
     ["{prebuilts_dir_name}/host/testcases/hello_world_test/**/*"])
+_TESTCASE_DEVICE_SRCS = glob(["{prebuilts_dir_name}/target_testcases/hello_world_test/**/*"])
 
 _LIB_OUTS = [f.replace("{prebuilts_dir_name}/host/", "") for f in _LIB_SRCS]
-_TESTCASE_OUTS = [
-    f.replace("{prebuilts_dir_name}/host/testcases/hello_world_test/", "")
-    for f in _TESTCASE_SRCS
+_TESTCASE_HOST_OUTS = [
+    f.replace("{prebuilts_dir_name}/host/testcases/hello_world_test/", "host/")
+    for f in _TESTCASE_HOST_SRCS
 ]
+_TESTCASE_DEVICE_OUTS = [
+    f.replace("{prebuilts_dir_name}/target_testcases/hello_world_test/", "device/")
+    for f in _TESTCASE_DEVICE_SRCS
+]
+
 
 genrule(name="hello_world_test_prebuilt",
-        srcs=_LIB_SRCS + _TESTCASE_SRCS,
-        outs=_LIB_OUTS + _TESTCASE_OUTS,
+        srcs=_LIB_SRCS + _TESTCASE_HOST_SRCS + _TESTCASE_DEVICE_SRCS,
+        outs=_LIB_OUTS + _TESTCASE_HOST_OUTS + _TESTCASE_DEVICE_OUTS,
         cmd="""
           src_files=($(SRCS))
           out_files=($(OUTS))