Merge changes from topic "cf_system_root_files" into main (0c71fa98) · Commits · e / os / android_build_soong

android/neverallow.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -237,6 +237,7 @@ func createInitFirstStageRules() []Rule {
		Without("name", "init_first_stage").
		Without("name", "init_first_stage.microdroid").
		With("install_in_root", "true").
		NotModuleType("prebuilt_root").
		Because("install_in_root is only for init_first_stage."),
		}
		}

android/packaging.go

+47 −18

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android
		import (
		"fmt"
		"path/filepath"
		"sort"
		"strings"

		"github.com/google/blueprint"
		@@ -377,14 +378,41 @@ func (p *PackagingBase) GatherPackagingSpecs(ctx ModuleContext) map[string]Packa
		// CopySpecsToDir is a helper that will add commands to the rule builder to copy the PackagingSpec
		// entries into the specified directory.
		func (p PackagingBase) CopySpecsToDir(ctx ModuleContext, builder RuleBuilder, specs map[string]PackagingSpec, dir WritablePath) (entries []string) {
		if len(specs) == 0 {
		dirsToSpecs := make(map[WritablePath]map[string]PackagingSpec)
		dirsToSpecs[dir] = specs
		return p.CopySpecsToDirs(ctx, builder, dirsToSpecs)
		}

		// CopySpecsToDirs is a helper that will add commands to the rule builder to copy the PackagingSpec
		// entries into corresponding directories.
		func (p PackagingBase) CopySpecsToDirs(ctx ModuleContext, builder RuleBuilder, dirsToSpecs map[WritablePath]map[string]PackagingSpec) (entries []string) {
		empty := true
		for _, specs := range dirsToSpecs {
		if len(specs) > 0 {
		empty = false
		break
		}
		}
		if empty {
		return entries
		}

		seenDir := make(map[string]bool)
		preparerPath := PathForModuleOut(ctx, "preparer.sh")
		cmd := builder.Command().Tool(preparerPath)
		var sb strings.Builder
		sb.WriteString("set -e\n")

		dirs := make([]WritablePath, 0, len(dirsToSpecs))
		for dir, _ := range dirsToSpecs {
		dirs = append(dirs, dir)
		}
		sort.Slice(dirs, func(i, j int) bool {
		return dirs[i].String() < dirs[j].String()
		})

		for _, dir := range dirs {
		specs := dirsToSpecs[dir]
		for _, k := range SortedKeys(specs) {
		ps := specs[k]
		destPath := filepath.Join(dir.String(), ps.relPathInPackage)
		@@ -404,6 +432,7 @@ func (p PackagingBase) CopySpecsToDir(ctx ModuleContext, builder RuleBuilder,
		sb.WriteString(fmt.Sprintf("chmod a+x %s\n", destPath))
		}
		}
		}

		WriteExecutableFileRuleVerbatim(ctx, preparerPath, sb.String())

etc/prebuilt_etc.go

+18 −8

Original line number	Diff line number	Diff line
		@@ -126,6 +126,15 @@ type prebuiltSubdirProperties struct {
		Relative_install_path *string `android:"arch_variant"`
		}

		type prebuiltRootProperties struct {
		// Install this module to the root directory, without partition subdirs. When this module is
		// added to PRODUCT_PACKAGES, this module will be installed to $PRODUCT_OUT/root, which will
		// then be copied to the root of system.img. When this module is packaged by other modules like
		// android_filesystem, this module will be installed to the root ("/"), unlike normal
		// prebuilt_root modules which are installed to the partition subdir (e.g. "/system/").
		Install_in_root *bool
		}

		type PrebuiltEtcModule interface {
		android.Module

		@@ -141,6 +150,11 @@ type PrebuiltEtc struct {
		android.DefaultableModuleBase

		properties prebuiltEtcProperties

		// rootProperties is used to return the value of the InstallInRoot() method. Currently, only
		// prebuilt_avb and prebuilt_root modules use this.
		rootProperties prebuiltRootProperties

		subdirProperties prebuiltSubdirProperties

		sourceFilePaths android.Paths
		@@ -156,9 +170,6 @@ type PrebuiltEtc struct {
		additionalDependencies *android.Paths

		usedSrcsProperty bool
		// installInRoot is used to return the value of the InstallInRoot() method. The default value is false.
		// Currently, only prebuilt_avb can be set to true.
		installInRoot bool

		makeClass string
		}
		@@ -246,7 +257,7 @@ func (p *PrebuiltEtc) DebugRamdiskVariantNeeded(ctx android.BaseModuleContext) b
		}

		func (p *PrebuiltEtc) InstallInRoot() bool {
		return p.installInRoot
		return proptools.Bool(p.rootProperties.Install_in_root)
		}

		func (p *PrebuiltEtc) RecoveryVariantNeeded(ctx android.BaseModuleContext) bool {
		@@ -502,21 +513,20 @@ func (p PrebuiltEtc) AndroidModuleBase() android.ModuleBase {

		func InitPrebuiltEtcModule(p *PrebuiltEtc, dirBase string) {
		p.installDirBase = dirBase
		p.installInRoot = false
		p.AddProperties(&p.properties)
		p.AddProperties(&p.subdirProperties)
		}

		func InitPrebuiltRootModule(p *PrebuiltEtc) {
		p.installDirBase = "."
		p.installInRoot = false
		p.AddProperties(&p.properties)
		p.AddProperties(&p.rootProperties)
		}

		func InitPrebuiltAvbModule(p *PrebuiltEtc) {
		p.installDirBase = "avb"
		p.installInRoot = true
		p.AddProperties(&p.properties)
		p.rootProperties.Install_in_root = proptools.BoolPtr(true)
		}

		// prebuilt_etc is for a prebuilt artifact that is installed in

filesystem/filesystem.go

+21 −2

Original line number	Diff line number	Diff line
		@@ -312,6 +312,25 @@ func (f filesystem) buildNonDepsFiles(ctx android.ModuleContext, builder andro
		}
		}

		func (f filesystem) copyPackagingSpecs(ctx android.ModuleContext, builder android.RuleBuilder, specs map[string]android.PackagingSpec, rootDir, rebasedDir android.WritablePath) []string {
		rootDirSpecs := make(map[string]android.PackagingSpec)
		rebasedDirSpecs := make(map[string]android.PackagingSpec)

		for rel, spec := range specs {
		if spec.Partition() == "root" {
		rootDirSpecs[rel] = spec
		} else {
		rebasedDirSpecs[rel] = spec
		}
		}

		dirsToSpecs := make(map[android.WritablePath]map[string]android.PackagingSpec)
		dirsToSpecs[rootDir] = rootDirSpecs
		dirsToSpecs[rebasedDir] = rebasedDirSpecs

		return f.CopySpecsToDirs(ctx, builder, dirsToSpecs)
		}

		func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) android.OutputPath {
		rootDir := android.PathForModuleOut(ctx, "root").OutputPath
		rebasedDir := rootDir
		@@ -322,7 +341,7 @@ func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) androi
		// Wipe the root dir to get rid of leftover files from prior builds
		builder.Command().Textf("rm -rf %s && mkdir -p %s", rootDir, rootDir)
		specs := f.gatherFilteredPackagingSpecs(ctx)
		f.entries = f.CopySpecsToDir(ctx, builder, specs, rebasedDir)
		f.entries = f.copyPackagingSpecs(ctx, builder, specs, rootDir, rebasedDir)

		f.buildNonDepsFiles(ctx, builder, rootDir)
		f.addMakeBuiltFiles(ctx, builder, rootDir)
		@@ -465,7 +484,7 @@ func (f *filesystem) buildCpioImage(ctx android.ModuleContext, compressed bool)
		// Wipe the root dir to get rid of leftover files from prior builds
		builder.Command().Textf("rm -rf %s && mkdir -p %s", rootDir, rootDir)
		specs := f.gatherFilteredPackagingSpecs(ctx)
		f.entries = f.CopySpecsToDir(ctx, builder, specs, rebasedDir)
		f.entries = f.copyPackagingSpecs(ctx, builder, specs, rootDir, rebasedDir)

		f.buildNonDepsFiles(ctx, builder, rootDir)
		f.buildFsverityMetadataFiles(ctx, builder, specs, rootDir, rebasedDir)

filesystem/system_image.go

+4 −3

Original line number	Diff line number	Diff line
		@@ -94,9 +94,10 @@ func (s *systemImage) buildLinkerConfigFile(ctx android.ModuleContext, root andr
		return output
		}

		// Filter the result of GatherPackagingSpecs to discard items targeting outside "system" partition.
		// Note that "apex" module installs its contents to "apex"(fake partition) as well
		// Filter the result of GatherPackagingSpecs to discard items targeting outside "system" / "root"
		// partition. Note that "apex" module installs its contents to "apex"(fake partition) as well
		// for symbol lookup by imitating "activated" paths.
		func (s *systemImage) filterPackagingSpec(ps android.PackagingSpec) bool {
		return s.filesystem.filterInstallablePackagingSpec(ps) && ps.Partition() == "system"
		return s.filesystem.filterInstallablePackagingSpec(ps) &&
		(ps.Partition() == "system" \|\| ps.Partition() == "root")
		}