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

Commit bd3a16b5 authored by Colin Cross's avatar Colin Cross
Browse files

Install sdk variants in unbundled builds and package uninstallable variants 

This effectively undoes both If6c3ee82d588e2742c85cef7244c090c93f38b8e
and I682e4f1f477f3024f7719dfaa67006ef335e0640.  SDK variants are now
installed again, which will fix unbundled builds of cc_test modules.
The platform variants used by com.android.virt are now packagable
even though they are not installable.

Fix the original problem in b/194403710 by adding a flag to platform
variants of modules in apexes that are not platform available, and
using that to prevent install and packaging dependencies.  That
allows the HideFromMake flag to go back to being used for preventing
install dependencies but not packaging dependencies.

Test: TestPackagingWithSkipInstallDeps
Test: TestFileSystemShouldInstallCoreVariantIfTargetBuildAppsIsSet
Test: TestFileSystemShouldSkipApexLibraries
Bug: 194403710
Bug: 268582372
Fixes: 274443025
Change-Id: If5418df3ddbb940bd631caebdf38daa81e71f40e
parent e018bc85

android/deptag.go

+2 −2
Original line number Diff line number Diff line
@@ -34,10 +34,10 @@ func (i InstallAlwaysNeededDependencyTag) InstallDepNeeded() bool { 


var _ InstallNeededDependencyTag = InstallAlwaysNeededDependencyTag{}



// IsInstallDepNeeded returns true if the dependency tag implements the InstallNeededDependencyTag

// IsInstallDepNeededTag returns true if the dependency tag implements the InstallNeededDependencyTag

// interface and the InstallDepNeeded returns true, meaning that the installed files of the parent

// should depend on the installed files of the child.

func IsInstallDepNeeded(tag blueprint.DependencyTag) bool {

func IsInstallDepNeededTag(tag blueprint.DependencyTag) bool {

	if i, ok := tag.(InstallNeededDependencyTag); ok {

		return i.InstallDepNeeded()

	}

android/license_metadata.go

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ func buildLicenseMetadata(ctx ModuleContext, licenseMetadataFile WritablePath) { 
		if ctx.OtherModuleHasProvider(dep, LicenseMetadataProvider) {

			info := ctx.OtherModuleProvider(dep, LicenseMetadataProvider).(*LicenseMetadataInfo)

			allDepMetadataFiles = append(allDepMetadataFiles, info.LicenseMetadataPath)

			if isContainer || IsInstallDepNeeded(ctx.OtherModuleDependencyTag(dep)) {

			if isContainer || isInstallDepNeeded(dep, ctx.OtherModuleDependencyTag(dep)) {

				allDepMetadataDepSets = append(allDepMetadataDepSets, info.LicenseMetadataDepSet)

			}

android/module.go

+27 −3
Original line number Diff line number Diff line
@@ -925,6 +925,12 @@ type commonProperties struct { 
	// and don't create a rule to install the file.

	SkipInstall bool `blueprint:"mutated"`



	// UninstallableApexPlatformVariant is set by MakeUninstallable called by the apex

	// mutator.  MakeUninstallable also sets HideFromMake.  UninstallableApexPlatformVariant

	// is used to avoid adding install or packaging dependencies into libraries provided

	// by apexes.

	UninstallableApexPlatformVariant bool `blueprint:"mutated"`



	// Whether the module has been replaced by a prebuilt

	ReplacedByPrebuilt bool `blueprint:"mutated"`
@@ -2009,6 +2015,7 @@ func (m *ModuleBase) IsSkipInstall() bool { 
// have other side effects, in particular when it adds a NOTICE file target,

// which other install targets might depend on.

func (m *ModuleBase) MakeUninstallable() {

	m.commonProperties.UninstallableApexPlatformVariant = true

	m.HideFromMake()

}
@@ -2038,13 +2045,19 @@ func (m *ModuleBase) EffectiveLicenseFiles() Paths { 
}



// computeInstallDeps finds the installed paths of all dependencies that have a dependency

// tag that is annotated as needing installation via the IsInstallDepNeeded method.

// tag that is annotated as needing installation via the isInstallDepNeeded method.

func (m *ModuleBase) computeInstallDeps(ctx ModuleContext) ([]*installPathsDepSet, []*packagingSpecsDepSet) {

	var installDeps []*installPathsDepSet

	var packagingSpecs []*packagingSpecsDepSet

	ctx.VisitDirectDeps(func(dep Module) {

		if IsInstallDepNeeded(ctx.OtherModuleDependencyTag(dep)) && !dep.IsHideFromMake() && !dep.IsSkipInstall() {

		if isInstallDepNeeded(dep, ctx.OtherModuleDependencyTag(dep)) {

			// Installation is still handled by Make, so anything hidden from Make is not

			// installable.

			if !dep.IsHideFromMake() && !dep.IsSkipInstall() {

				installDeps = append(installDeps, dep.base().installFilesDepSet)

			}

			// Add packaging deps even when the dependency is not installed so that uninstallable

			// modules can still be packaged.  Often the package will be installed instead.

			packagingSpecs = append(packagingSpecs, dep.base().packagingSpecsDepSet)

		}

	})
@@ -2052,6 +2065,17 @@ func (m *ModuleBase) computeInstallDeps(ctx ModuleContext) ([]*installPathsDepSe 
	return installDeps, packagingSpecs

}



// isInstallDepNeeded returns true if installing the output files of the current module

// should also install the output files of the given dependency and dependency tag.

func isInstallDepNeeded(dep Module, tag blueprint.DependencyTag) bool {

	// Don't add a dependency from the platform to a library provided by an apex.

	if dep.base().commonProperties.UninstallableApexPlatformVariant {

		return false

	}

	// Only install modules if the dependency tag is an InstallDepNeeded tag.

	return IsInstallDepNeededTag(tag)

}



func (m *ModuleBase) FilesToInstall() InstallPaths {

	return m.installFiles

}

android/packaging_test.go

+2 −2
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ func TestPackagingBaseSingleTarget(t *testing.T) { 


func TestPackagingWithSkipInstallDeps(t *testing.T) {

	// package -[dep]-> foo -[dep]-> bar      -[dep]-> baz

	//                  OK           SKIPPED

	// Packaging should continue transitively through modules that are not installed.

	multiTarget := false

	runPackagingTest(t, multiTarget,

		`
@@ -396,5 +396,5 @@ func TestPackagingWithSkipInstallDeps(t *testing.T) { 
			name: "package",

			deps: ["foo"],

		}

		`, []string{"lib64/foo"})

		`, []string{"lib64/foo", "lib64/bar", "lib64/baz"})

}

apex/apex_test.go

+52 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import ( 
	"android/soong/cc"

	"android/soong/dexpreopt"

	prebuilt_etc "android/soong/etc"

	"android/soong/filesystem"

	"android/soong/java"

	"android/soong/rust"

	"android/soong/sh"
@@ -10375,3 +10376,54 @@ func TestStubLibrariesMultipleApexViolation(t *testing.T) { 
		}

	}

}



func TestFileSystemShouldSkipApexLibraries(t *testing.T) {

	context := android.GroupFixturePreparers(

		android.PrepareForIntegrationTestWithAndroid,

		cc.PrepareForIntegrationTestWithCc,

		PrepareForTestWithApexBuildComponents,

		prepareForTestWithMyapex,

		filesystem.PrepareForTestWithFilesystemBuildComponents,

	)

	result := context.RunTestWithBp(t, `

		android_system_image {

			name: "myfilesystem",

			deps: [

				"libfoo",

			],

			linker_config_src: "linker.config.json",

		}



		cc_library {

			name: "libfoo",

			shared_libs: [

				"libbar",

			],

			stl: "none",

		}



		cc_library {

			name: "libbar",

			stl: "none",

			apex_available: ["myapex"],

		}



		apex {

			name: "myapex",

			native_shared_libs: ["libbar"],

			key: "myapex.key",

			updatable: false,

		}



		apex_key {

			name: "myapex.key",

			public_key: "testkey.avbpubkey",

			private_key: "testkey.pem",

		}

	`)



	inputs := result.ModuleForTests("myfilesystem", "android_common").Output("deps.zip").Implicits

	android.AssertStringListDoesNotContain(t, "filesystem should not have libbar",

		inputs.Strings(),

		"out/soong/.intermediates/libbar/android_arm64_armv8-a_shared/libbar.so")

}