Merge "Revert "Revert "Fix NDK library sysroot arrangement.""" (b4949c2b) · Commits · e / os / android_build_soong

cc/library.go

+1 −3

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import (
		"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 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) {
		!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,

+13 −10

Original line number	Diff line number	Diff line
		@@ -528,17 +528,20 @@ func (stub *stubDecorator) nativeCoverage() bool {
		return false
		}

		func (stub *stubDecorator) install(ctx ModuleContext, path android.Path) {
		arch := ctx.Target().Arch.ArchType.Name
		// arm64 isn't actually a multilib toolchain, so unlike the other LP64
		// architectures it's just installed to lib.
		libDir := "lib"
		if ctx.toolchain().Is64Bit() && arch != "arm64" {
		libDir = "lib64"
		// Returns the install path for unversioned NDK libraries (currently only static
		// libraries).
		func getUnversionedLibraryInstallPath(ctx ModuleContext) android.InstallPath {
		return getNdkSysrootBase(ctx).Join(ctx, "usr/lib", config.NDKTriple(ctx.toolchain()))
		}

		// Returns the install path for versioned NDK libraries. These are most often
		// stubs, but the same paths are used for CRT objects.
		func getVersionedLibraryInstallPath(ctx ModuleContext, apiLevel android.ApiLevel) android.InstallPath {
		return getUnversionedLibraryInstallPath(ctx).Join(ctx, apiLevel.String())
		}

		installDir := getNdkInstallBase(ctx).Join(ctx, fmt.Sprintf(
		"platforms/android-%s/arch-%s/usr/%s", stub.apiLevel, arch, libDir))
		func (stub *stubDecorator) install(ctx ModuleContext, path android.Path) {
		installDir := getVersionedLibraryInstallPath(ctx, stub.apiLevel)
		stub.installPath = ctx.InstallFile(installDir, path.Base(), path)
		}