From fe68968769de99e829e94241b51f45ae848a787d Mon Sep 17 00:00:00 2001 From: Sebastian Birunt Date: Thu, 1 Aug 2024 11:04:42 +0200 Subject: [PATCH] Revert "fix: install path for 64BitOnly" This reverts commit c62f3778284836be958d13982a01bfdb0829c747. Adding `64` suffix to `installRel` makes it wrong. `installRel` should be exactly as it is provided in the rule. Signed-off-by: Sebastian Birunt Change-Id: Ie396901ddda1fb0ae86b7e292418b49267cd5d1c --- core/androidbp_cclibs.go | 6 +----- core/androidbp_resource.go | 10 +--------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/core/androidbp_cclibs.go b/core/androidbp_cclibs.go index 53f26e93..ccf9974a 100644 --- a/core/androidbp_cclibs.go +++ b/core/androidbp_cclibs.go @@ -309,11 +309,7 @@ func addCcLibraryProps(mod bpwriter.Module, m ModuleLibrary, ctx blueprint.Modul _, installRel, ok := getSoongInstallPath(m.getInstallableProps()) if ok && installRel != "" { - if backend.Get().GetToolchain(toolchain.TgtTypeTarget).Is64BitOnly() { - mod.AddString("relative_install_path", installRel+"64") - } else { - mod.AddString("relative_install_path", installRel) - } + mod.AddString("relative_install_path", installRel) } addProvenanceProps(ctx, mod, &m) diff --git a/core/androidbp_resource.go b/core/androidbp_resource.go index f6b703a5..d8733187 100644 --- a/core/androidbp_resource.go +++ b/core/androidbp_resource.go @@ -10,7 +10,6 @@ import ( "github.com/ARM-software/bob-build/core/backend" "github.com/ARM-software/bob-build/core/file" - "github.com/ARM-software/bob-build/core/toolchain" "github.com/ARM-software/bob-build/internal/bpwriter" "github.com/ARM-software/bob-build/internal/utils" ) @@ -31,14 +30,7 @@ func writeDataResourceModule(m bpwriter.Module, src, installRel, linkName string func writeCodeResourceModule(m bpwriter.Module, src, installRel, linkName string) { m.AddStringList("srcs", []string{src}) m.AddString("stem", filepath.Base(src)) - - if installRel != "" { - if backend.Get().GetToolchain(toolchain.TgtTypeTarget).Is64BitOnly() { - m.AddString("relative_install_path", installRel+"64") - } else { - m.AddString("relative_install_path", installRel) - } - } + m.AddString("relative_install_path", installRel) } func (m *ModuleResource) getAndroidbpResourceName(src string) string {