Merge "Rename ART release APEX to com.android.art." am: 9649748516 am: c271bfb232

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1455025

Change-Id: Id52ae6fa361aac18c1162a9180cc3a2ff870eeeb
This commit is contained in:
Martin Stjernholm
2020-10-23 11:05:22 +00:00
committed by Automerger Merge Worker
4 changed files with 10 additions and 9 deletions

View File

@@ -152,7 +152,7 @@ func makeCompatSymlinks(name string, ctx android.ModuleContext) (symlinks []stri
}
// TODO(b/124106384): Clean up compat symlinks for ART binaries.
if strings.HasPrefix(name, "com.android.art.") {
if name == "com.android.art" || strings.HasPrefix(name, "com.android.art.") {
addSymlink("/apex/com.android.art/bin/dalvikvm", "$(TARGET_OUT)/bin", "dalvikvm")
dex2oat := "dex2oat32"
if ctx.Config().Android64() {