diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apex/apex.go b/apex/apex.go index 23f6d3729..4f79c4227 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -829,7 +829,9 @@ func getCopyManifestForNativeLibrary(ccMod *cc.Module, config android.Config, ha dirInApex = "lib64" } dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath()) - if ccMod.Target().NativeBridge == android.NativeBridgeEnabled { + if !ccMod.Arch().Native { + dirInApex = filepath.Join(dirInApex, ccMod.Arch().ArchType.String()) + } else if ccMod.Target().NativeBridge == android.NativeBridgeEnabled { dirInApex = filepath.Join(dirInApex, ccMod.Target().NativeBridgeRelativePath) } if handleSpecialLibs && cc.InstallToBootstrap(ccMod.BaseModuleName(), config) { @@ -852,7 +854,9 @@ func getCopyManifestForNativeLibrary(ccMod *cc.Module, config android.Config, ha func getCopyManifestForExecutable(cc *cc.Module) (fileToCopy android.Path, dirInApex string) { dirInApex = filepath.Join("bin", cc.RelativeInstallPath()) - if cc.Target().NativeBridge == android.NativeBridgeEnabled { + if !cc.Arch().Native { + dirInApex = filepath.Join(dirInApex, cc.Arch().ArchType.String()) + } else if cc.Target().NativeBridge == android.NativeBridgeEnabled { dirInApex = filepath.Join(dirInApex, cc.Target().NativeBridgeRelativePath) } fileToCopy = cc.OutputFile().Path() |