commit 4caba62b51359be9baddb5c53e01b380999f4c31
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Mar 17 11:52:41 2025 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 17 11:52:41 2025 -0700
tree c87ba31103297423f669021dd92ae4f9f56543eb
parent cc7cd28a80b3ccbe37af09b8e034b1defbf9aa90
parent acf4472951f6e95807f98bffa21b36b292cdd9d1

Merge "[Sim] Add device paths for ART simulator" into main

android/configured_jars.go

diff --git a/android/configured_jars.go b/android/configured_jars.go
index c7b808f..657826e 100644
--- a/android/configured_jars.go
+++ b/android/configured_jars.go
@@ -264,7 +264,7 @@
 			subdir = filepath.Join("apex", apex, "javalib")
 		}
 
-		if ostype.Class == Host {
+		if ostype.Class == Host || cfg.IsEnvTrue("ART_USE_SIMULATOR") {
 			paths[i] = filepath.Join(cfg.Getenv("OUT_DIR"), "host", cfg.PrebuiltOS(), subdir, name)
 		} else {
 			paths[i] = filepath.Join("/", subdir, name)