commit 4048bb0a892d16158263e68c08de943b66610c72
author Dan Albert <danalbert@google.com> Mon Apr 03 20:19:07 2023 +0000
committer Dan Albert <danalbert@google.com> Tue Apr 04 23:27:15 2023 +0000
tree f48753d04ddf22297012f1ba5688171a4439f279
parent 28ba80665d90d391c6cc69f29e8dab68aa4620f8

Revert "Revert "Fix NDK library sysroot arrangement.""

This reverts commit 961cf1cf9c59d54dc5693ca156f3eb79caab1102.

Reason for revert: Fixed

Change-Id: I3c5c0b89c924753b62c1bc126d7e64975ef7f137

cc/library.go

diff --git a/cc/library.go b/cc/library.go
index a9ada97..7504302 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -26,7 +26,6 @@
 	"android/soong/android"
 	"android/soong/bazel"
 	"android/soong/bazel/cquery"
-	"android/soong/cc/config"
 
 	"github.com/google/blueprint"
 	"github.com/google/blueprint/pathtools"
@@ -2261,8 +2260,7 @@
 		!ctx.useVndk() && !ctx.inRamdisk() && !ctx.inVendorRamdisk() && !ctx.inRecovery() && ctx.Device() &&
 		library.baseLinker.sanitize.isUnsanitizedVariant() &&
 		ctx.isForPlatform() && !ctx.isPreventInstall() {
-		installPath := getNdkSysrootBase(ctx).Join(
-			ctx, "usr/lib", config.NDKTriple(ctx.toolchain()), file.Base())
+		installPath := getUnversionedLibraryInstallPath(ctx).Join(ctx, file.Base())
 
 		ctx.ModuleBuild(pctx, android.ModuleBuildParams{
 			Rule:        android.Cp,