openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix dex2oat symlink now that we generate dex2oat32/dex2oat64. 

Test: m
Bug: 155257660
Change-Id: I466feabc64c0fb77fcf652be81bc0c4944b84ac0
This commit is contained in:
Nicolas Geoffray 2020-04-29 12:00:41 +01:00
parent cceb7f2c10
commit 101a7622fe
1 changed files with 5 additions and 3 deletions
Show Stats 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