StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dex2oat symlink now that we generate dex2oat32/dex2oat64."

Browse Source
This commit is contained in:
Nicolas Geoffray
2020-05-01 13:49:51 +00:00
committed by Gerrit Code Review
parent 74d25e39f0 d2a61c8752
commit b8bb5d05ce
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/vndk.go
View File

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