From acbf6c76c63c8583771badafbdacd219cb70d49d Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 9 Jul 2019 16:19:16 +0900 Subject: [PATCH] Use ctx.Target().NativeBridge to detect if the arch is translated or not Bug: 137015854 Test: m Test: build cf_x86_phone and ensure there is no dangling symlink /system/lib/arm/libm.so Change-Id: I0f5efdb9e1f5e4e213ca4ebaa28ace0a130b36a6 --- apex/apex.go | 10 ++++------ cc/binary.go | 3 ++- cc/library.go | 3 ++- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index 41728d11c..1422493a2 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -656,7 +656,7 @@ func getCopyManifestForNativeLibrary(cc *cc.Module, handleSpecialLibs bool) (fil dirInApex = "lib64" } dirInApex = filepath.Join(dirInApex, cc.RelativeInstallPath()) - if !cc.Arch().Native { + if cc.Target().NativeBridge == android.NativeBridgeEnabled || !cc.Arch().Native { dirInApex = filepath.Join(dirInApex, cc.Arch().ArchType.String()) } if handleSpecialLibs { @@ -681,6 +681,9 @@ func getCopyManifestForNativeLibrary(cc *cc.Module, handleSpecialLibs bool) (fil func getCopyManifestForExecutable(cc *cc.Module) (fileToCopy android.Path, dirInApex string) { dirInApex = filepath.Join("bin", cc.RelativeInstallPath()) + if cc.Target().NativeBridge == android.NativeBridgeEnabled || !cc.Arch().Native { + dirInApex = filepath.Join(dirInApex, cc.Arch().ArchType.String()) + } fileToCopy = cc.OutputFile().Path() return } @@ -780,11 +783,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { } case executableTag: if cc, ok := child.(*cc.Module); ok { - if !cc.Arch().Native { - // There is only one 'bin' directory so we shouldn't bother copying in - // native-bridge'd binaries and only use main ones. - return true - } fileToCopy, dirInApex := getCopyManifestForExecutable(cc) filesInfo = append(filesInfo, apexFile{fileToCopy, depName, dirInApex, nativeExecutable, cc, cc.Symlinks()}) return true diff --git a/cc/binary.go b/cc/binary.go index 1757f1cd6..149a92e80 100644 --- a/cc/binary.go +++ b/cc/binary.go @@ -444,7 +444,8 @@ func (binary *binaryDecorator) install(ctx ModuleContext, file android.Path) { // Bionic binaries (e.g. linker) is installed to the bootstrap subdirectory. // The original path becomes a symlink to the corresponding file in the // runtime APEX. - if installToBootstrap(ctx.baseModuleName(), ctx.Config()) && ctx.Arch().Native && ctx.apexName() == "" && !ctx.inRecovery() { + translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled || !ctx.Arch().Native + if installToBootstrap(ctx.baseModuleName(), ctx.Config()) && !translatedArch && ctx.apexName() == "" && !ctx.inRecovery() { if ctx.Device() && isBionic(ctx.baseModuleName()) { binary.installSymlinkToRuntimeApex(ctx, file) } diff --git a/cc/library.go b/cc/library.go index 6ac0c39bc..cb31979e9 100644 --- a/cc/library.go +++ b/cc/library.go @@ -952,7 +952,8 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) { // Bionic libraries (e.g. libc.so) is installed to the bootstrap subdirectory. // The original path becomes a symlink to the corresponding file in the // runtime APEX. - if installToBootstrap(ctx.baseModuleName(), ctx.Config()) && !library.buildStubs() && ctx.Arch().Native && !ctx.inRecovery() { + translatedArch := ctx.Target().NativeBridge == android.NativeBridgeEnabled || !ctx.Arch().Native + if installToBootstrap(ctx.baseModuleName(), ctx.Config()) && !library.buildStubs() && !translatedArch && !ctx.inRecovery() { if ctx.Device() && isBionic(ctx.baseModuleName()) { library.installSymlinkToRuntimeApex(ctx, file) }