diff options
| author | 2025-03-17 12:15:15 -0700 | |
|---|---|---|
| committer | 2025-03-17 12:15:15 -0700 | |
| commit | 445098646a9283c98bbfce7d1a3c96d5e644a81f (patch) | |
| tree | c87ba31103297423f669021dd92ae4f9f56543eb /android | |
| parent | d33e0b1205cca95eaed64d44830ea0a088a63a67 (diff) | |
| parent | 4caba62b51359be9baddb5c53e01b380999f4c31 (diff) | |
Merge "[Sim] Add device paths for ART simulator" into main am: 4caba62b51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680676
Change-Id: I35d645b7b4ac833b1ed74d75fa7b7ee7f323e28b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android')
| -rw-r--r-- | android/configured_jars.go | 2 |
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) |