summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-17 11:52:41 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-03-17 11:52:41 -0700
commit4caba62b51359be9baddb5c53e01b380999f4c31 (patch)
treec87ba31103297423f669021dd92ae4f9f56543eb /android
parentcc7cd28a80b3ccbe37af09b8e034b1defbf9aa90 (diff)
parentacf4472951f6e95807f98bffa21b36b292cdd9d1 (diff)
Merge "[Sim] Add device paths for ART simulator" into main
Diffstat (limited to 'android')
-rw-r--r--android/configured_jars.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/android/configured_jars.go b/android/configured_jars.go
index c7b808f3d..657826e98 100644
--- a/android/configured_jars.go
+++ b/android/configured_jars.go
@@ -264,7 +264,7 @@ func (l *ConfiguredJarList) DevicePaths(cfg Config, ostype OsType) []string {
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)