diff options
| author | 2019-09-17 14:45:31 -0700 | |
|---|---|---|
| committer | 2019-09-18 16:23:18 +0000 | |
| commit | fe6330c7d2d6102a0436da2892e71e3b490ac15c (patch) | |
| tree | 6fd43b95707b7dd699b1e8d4b259bf9fe6415101 /apex/apex.go | |
| parent | 1f6c94a3ac5cc86c81a3a8e9ed5561d0e1e9c5fc (diff) | |
Remove old-style support for translated second architectures
Translated second architectures now go in NativeBridgeArch instead
of DeviceSecondaryArch.
Bug: 141242600
Test: m checkbuild
Change-Id: I568046330abc002d4eed582cb999b62a5eaba790
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apex/apex.go b/apex/apex.go index 4f79c4227..23f6d3729 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -829,9 +829,7 @@ func getCopyManifestForNativeLibrary(ccMod *cc.Module, config android.Config, ha dirInApex = "lib64" } dirInApex = filepath.Join(dirInApex, ccMod.RelativeInstallPath()) - if !ccMod.Arch().Native { - dirInApex = filepath.Join(dirInApex, ccMod.Arch().ArchType.String()) - } else if ccMod.Target().NativeBridge == android.NativeBridgeEnabled { + if ccMod.Target().NativeBridge == android.NativeBridgeEnabled { dirInApex = filepath.Join(dirInApex, ccMod.Target().NativeBridgeRelativePath) } if handleSpecialLibs && cc.InstallToBootstrap(ccMod.BaseModuleName(), config) { @@ -854,9 +852,7 @@ 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.Arch().Native { - dirInApex = filepath.Join(dirInApex, cc.Arch().ArchType.String()) - } else if cc.Target().NativeBridge == android.NativeBridgeEnabled { + if cc.Target().NativeBridge == android.NativeBridgeEnabled { dirInApex = filepath.Join(dirInApex, cc.Target().NativeBridgeRelativePath) } fileToCopy = cc.OutputFile().Path() |