Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 961cf1cf authored by Rebecca Chyung's avatar Rebecca Chyung
Browse files

Revert "Fix NDK library sysroot arrangement." 

This reverts commit 169256f5.

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/build-details/9868109/targets/mokey-userdebug, bug b/276513771

Change-Id: Iea77994cd4ff0f61a8fa72e52cd1b601bc7cc1a0
parent 169256f5

cc/library.go

+3 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import ( 
	"android/soong/android"

	"android/soong/bazel"

	"android/soong/bazel/cquery"

	"android/soong/cc/config"



	"github.com/google/blueprint"

	"github.com/google/blueprint/pathtools"
@@ -2255,7 +2256,8 @@ 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 := getUnversionedLibraryInstallPath(ctx).Join(ctx, file.Base())

		installPath := getNdkSysrootBase(ctx).Join(

			ctx, "usr/lib", config.NDKTriple(ctx.toolchain()), file.Base())



		ctx.ModuleBuild(pctx, android.ModuleBuildParams{

			Rule:        android.Cp,

cc/ndk_library.go

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

}



// 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())

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"

	}



func (stub *stubDecorator) install(ctx ModuleContext, path android.Path) {

	installDir := getVersionedLibraryInstallPath(ctx, stub.apiLevel)

	installDir := getNdkInstallBase(ctx).Join(ctx, fmt.Sprintf(

		"platforms/android-%s/arch-%s/usr/%s", stub.apiLevel, arch, libDir))

	stub.installPath = ctx.InstallFile(installDir, path.Base(), path)

}