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

Commit 95b07f2b authored by Colin Cross's avatar Colin Cross
Browse files

Don't copy uninstallable variants of NDK libraries to sysroot 

After the next patch libraryDecorator.install will be called for
uninstallable variants of modules, manually filter them out when
copying to the NDK sysroot.

Bug: 124313442
Test: m checkbuild
Change-Id: I28b538d4ae271dc5e27c386d7cfa538ac0ed841b
parent f1c48afc

cc/cc.go

+5 −0
Original line number Diff line number Diff line
@@ -432,6 +432,7 @@ type ModuleContextIntf interface { 
	mustUseVendorVariant() bool

	nativeCoverage() bool

	directlyInAnyApex() bool

	isPreventInstall() bool

}



type ModuleContext interface {
@@ -1325,6 +1326,10 @@ func (ctx *moduleContextImpl) directlyInAnyApex() bool { 
	return ctx.mod.DirectlyInAnyApex()

}



func (ctx *moduleContextImpl) isPreventInstall() bool {

	return ctx.mod.Properties.PreventInstall

}



func newBaseModule(hod android.HostOrDeviceSupported, multilib android.Multilib) *Module {

	return &Module{

		hod:      hod,

cc/library.go

+1 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,7 @@ func (library *libraryDecorator) install(ctx ModuleContext, file android.Path) { 
	if Bool(library.Properties.Static_ndk_lib) && library.static() &&

		!ctx.useVndk() && !ctx.inRamdisk() && !ctx.inVendorRamdisk() && !ctx.inRecovery() && ctx.Device() &&

		library.baseLinker.sanitize.isUnsanitizedVariant() &&

		!library.buildStubs() && ctx.sdkVersion() == "" {

		ctx.isForPlatform() && !ctx.isPreventInstall() {

		installPath := getNdkSysrootBase(ctx).Join(

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