diff options
| author | 2025-03-17 12:38:54 -0700 | |
|---|---|---|
| committer | 2025-03-17 12:38:54 -0700 | |
| commit | 49a1a9ea4876fb9469393f62b9035b0091a053e9 (patch) | |
| tree | 3b213900586a1fbe674bff8b8245a68a766e5e29 /android | |
| parent | 56e08048275e28e200cddc7e7f5183b858112334 (diff) | |
| parent | 445098646a9283c98bbfce7d1a3c96d5e644a81f (diff) | |
Merge "[Sim] Add device paths for ART simulator" into main am: 4caba62b51 am: 445098646a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2680676
Change-Id: I279202b83c74be4e76e700a6ba943cf62fb12904
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) |