From 6fb0d44c15ccae0ab3d58526d3d15a8ede357961 Mon Sep 17 00:00:00 2001
From: Fan Yang <52458914+fanyang-mono@users.noreply.github.com>
Date: Fri, 30 Jul 2021 12:38:19 -0400
Subject: [PATCH] Do not set CrossBuild to true when building runtime tests for
 Android (#55641)

* Fix _packageRID

* Hack to enable arm64 run for PR

* Dealing with the case when both PortableBuild and CrossBuild were set to true

* Do not set CrossBuild to true when building for Android

* Update src/tests/build.sh

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>

* Revert qualification hack

Co-authored-by: Adeel Mujahid <3840695+am11@users.noreply.github.com>
---
 src/tests/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/tests/build.sh b/src/tests/build.sh
index 53953f1..7bd0ca0 100755
--- a/src/tests/build.sh
+++ b/src/tests/build.sh
@@ -567,7 +567,7 @@ if [[ "${__BuildArch}" != "${__HostArch}" ]]; then
     __CrossBuild=1
 fi
 
-if [[ "$__CrossBuild" == 1 ]]; then
+if [[ "$__CrossBuild" == 1 && "$__TargetOS" != "Android" ]]; then
     __UnprocessedBuildArgs+=("/p:CrossBuild=true")
 fi
 
-- 
2.7.4