Merge changes I1d6750db,Ie2c197bb,I6a51c89a (d3b30670) · Commits · e / os / android_build_soong

android/module.go

+54 −21

Original line number	Diff line number	Diff line
		@@ -441,6 +441,10 @@ type Module interface {

		FilesToInstall() InstallPaths
		PackagingSpecs() []PackagingSpec

		// TransitivePackagingSpecs returns the PackagingSpecs for this module and any transitive
		// dependencies with dependency tags for which IsInstallDepNeeded() returns true.
		TransitivePackagingSpecs() []PackagingSpec
		}

		// Qualified id for a module
		@@ -1005,8 +1009,10 @@ type ModuleBase struct {

		noAddressSanitizer bool
		installFiles InstallPaths
		installFilesDepSet *installPathsDepSet
		checkbuildFiles Paths
		packagingSpecs []PackagingSpec
		packagingSpecsDepSet *packagingSpecsDepSet
		noticeFiles Paths
		phonies map[string]Paths

		@@ -1338,19 +1344,17 @@ func (m *ModuleBase) ExportedToMake() bool {

		// computeInstallDeps finds the installed paths of all dependencies that have a dependency
		// tag that is annotated as needing installation via the IsInstallDepNeeded method.
		func (m *ModuleBase) computeInstallDeps(ctx blueprint.ModuleContext) InstallPaths {
		var result InstallPaths
		ctx.WalkDeps(func(child, parent blueprint.Module) bool {
		if a, ok := child.(Module); ok {
		if IsInstallDepNeeded(ctx.OtherModuleDependencyTag(child)) {
		result = append(result, a.FilesToInstall()...)
		return true
		}
		func (m ModuleBase) computeInstallDeps(ctx ModuleContext) ([]installPathsDepSet, []*packagingSpecsDepSet) {
		var installDeps []*installPathsDepSet
		var packagingSpecs []*packagingSpecsDepSet
		ctx.VisitDirectDeps(func(dep Module) {
		if IsInstallDepNeeded(ctx.OtherModuleDependencyTag(dep)) {
		installDeps = append(installDeps, dep.base().installFilesDepSet)
		packagingSpecs = append(packagingSpecs, dep.base().packagingSpecsDepSet)
		}
		return false
		})

		return result
		return installDeps, packagingSpecs
		}

		func (m *ModuleBase) FilesToInstall() InstallPaths {
		@@ -1361,6 +1365,10 @@ func (m *ModuleBase) PackagingSpecs() []PackagingSpec {
		return m.packagingSpecs
		}

		func (m *ModuleBase) TransitivePackagingSpecs() []PackagingSpec {
		return m.packagingSpecsDepSet.ToList()
		}

		func (m *ModuleBase) NoAddressSanitizer() bool {
		return m.noAddressSanitizer
		}
		@@ -1587,11 +1595,15 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
		module: m.module,
		bp: blueprintCtx,
		baseModuleContext: m.baseModuleContextFactory(blueprintCtx),
		installDeps: m.computeInstallDeps(blueprintCtx),
		installFiles: m.installFiles,
		variables: make(map[string]string),
		}

		dependencyInstallFiles, dependencyPackagingSpecs := m.computeInstallDeps(ctx)
		// set m.installFilesDepSet to only the transitive dependencies to be used as the dependencies
		// of installed files of this module. It will be replaced by a depset including the installed
		// files of this module at the end for use by modules that depend on this one.
		m.installFilesDepSet = newInstallPathsDepSet(nil, dependencyInstallFiles)

		// Temporarily continue to call blueprintCtx.GetMissingDependencies() to maintain the previous behavior of never
		// reporting missing dependency errors in Blueprint when AllowMissingDependencies == true.
		// TODO: This will be removed once defaults modules handle missing dependency errors
		@@ -1700,6 +1712,9 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
		}
		}

		m.installFilesDepSet = newInstallPathsDepSet(m.installFiles, dependencyInstallFiles)
		m.packagingSpecsDepSet = newPackagingSpecsDepSet(m.packagingSpecs, dependencyPackagingSpecs)

		m.buildParams = ctx.buildParams
		m.ruleParams = ctx.ruleParams
		m.variables = ctx.variables
		@@ -1874,7 +1889,6 @@ type moduleContext struct {
		bp blueprint.ModuleContext
		baseModuleContext
		packagingSpecs []PackagingSpec
		installDeps InstallPaths
		installFiles InstallPaths
		checkbuildFiles Paths
		module Module
		@@ -2420,8 +2434,7 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat
		m.module.base().hooks.runInstallHooks(m, srcPath, fullInstallPath, false)

		if !m.skipInstall(fullInstallPath) {

		deps = append(deps, m.installDeps.Paths()...)
		deps = append(deps, m.module.base().installFilesDepSet.ToList().Paths()...)

		var implicitDeps, orderOnlyDeps Paths

		@@ -2858,3 +2871,23 @@ func CheckBlueprintSyntax(ctx BaseModuleContext, filename string, contents strin
		bpctx := ctx.blueprintBaseModuleContext()
		return blueprint.CheckBlueprintSyntax(bpctx.ModuleFactories(), filename, contents)
		}

		// installPathsDepSet is a thin type-safe wrapper around the generic depSet. It always uses
		// topological order.
		type installPathsDepSet struct {
		depSet
		}

		// newInstallPathsDepSet returns an immutable packagingSpecsDepSet with the given direct and
		// transitive contents.
		func newInstallPathsDepSet(direct InstallPaths, transitive []installPathsDepSet) installPathsDepSet {
		return &installPathsDepSet{*newDepSet(TOPOLOGICAL, direct, transitive)}
		}

		// ToList returns the installPathsDepSet flattened to a list in topological order.
		func (d *installPathsDepSet) ToList() InstallPaths {
		if d == nil {
		return nil
		}
		return d.depSet.ToList().(InstallPaths)
		}

android/packaging.go

+20 −0

Original line number	Diff line number	Diff line
		@@ -203,3 +203,23 @@ func (p *PackagingBase) CopyDepsToZip(ctx ModuleContext, zipOut OutputPath) (ent
		builder.Build("zip_deps", fmt.Sprintf("Zipping deps for %s", ctx.ModuleName()))
		return entries
		}

		// packagingSpecsDepSet is a thin type-safe wrapper around the generic depSet. It always uses
		// topological order.
		type packagingSpecsDepSet struct {
		depSet
		}

		// newPackagingSpecsDepSet returns an immutable packagingSpecsDepSet with the given direct and
		// transitive contents.
		func newPackagingSpecsDepSet(direct []PackagingSpec, transitive []packagingSpecsDepSet) packagingSpecsDepSet {
		return &packagingSpecsDepSet{*newDepSet(TOPOLOGICAL, direct, transitive)}
		}

		// ToList returns the packagingSpecsDepSet flattened to a list in topological order.
		func (d *packagingSpecsDepSet) ToList() []PackagingSpec {
		if d == nil {
		return nil
		}
		return d.depSet.ToList().([]PackagingSpec)
		}

android/paths.go

+39 −0

Original line number	Diff line number	Diff line
		@@ -542,6 +542,45 @@ func firstUniquePathsMap(list Paths) Paths {
		return list[:k]
		}

		// FirstUniqueInstallPaths returns all unique elements of an InstallPaths, keeping the first copy of each. It
		// modifies the InstallPaths slice contents in place, and returns a subslice of the original slice.
		func FirstUniqueInstallPaths(list InstallPaths) InstallPaths {
		// 128 was chosen based on BenchmarkFirstUniquePaths results.
		if len(list) > 128 {
		return firstUniqueInstallPathsMap(list)
		}
		return firstUniqueInstallPathsList(list)
		}

		func firstUniqueInstallPathsList(list InstallPaths) InstallPaths {
		k := 0
		outer:
		for i := 0; i < len(list); i++ {
		for j := 0; j < k; j++ {
		if list[i] == list[j] {
		continue outer
		}
		}
		list[k] = list[i]
		k++
		}
		return list[:k]
		}

		func firstUniqueInstallPathsMap(list InstallPaths) InstallPaths {
		k := 0
		seen := make(map[InstallPath]bool, len(list))
		for i := 0; i < len(list); i++ {
		if seen[list[i]] {
		continue
		}
		seen[list[i]] = true
		list[k] = list[i]
		k++
		}
		return list[:k]
		}

		// LastUniquePaths returns all unique elements of a Paths, keeping the last copy of each. It
		// modifies the Paths slice contents in place, and returns a subslice of the original slice.
		func LastUniquePaths(list Paths) Paths {

cmd/sbox/sbox.go

+5 −2

Original line number	Diff line number	Diff line
		@@ -337,7 +337,7 @@ func copyFiles(copies []*sbox_proto.Copy, fromDir, toDir string) error {
		for _, copyPair := range copies {
		fromPath := joinPath(fromDir, copyPair.GetFrom())
		toPath := joinPath(toDir, copyPair.GetTo())
		err := copyOneFile(fromPath, toPath)
		err := copyOneFile(fromPath, toPath, copyPair.GetExecutable())
		if err != nil {
		return fmt.Errorf("error copying %q to %q: %w", fromPath, toPath, err)
		}
		@@ -346,7 +346,7 @@ func copyFiles(copies []*sbox_proto.Copy, fromDir, toDir string) error {
		}

		// copyOneFile copies a file.
		func copyOneFile(from string, to string) error {
		func copyOneFile(from string, to string, executable bool) error {
		err := os.MkdirAll(filepath.Dir(to), 0777)
		if err != nil {
		return err
		@@ -358,6 +358,9 @@ func copyOneFile(from string, to string) error {
		}

		perm := stat.Mode()
		if executable {
		perm = perm \| 0100 // u+x
		}

		in, err := os.Open(from)
		if err != nil {

cmd/sbox/sbox_proto/sbox.pb.go

+29 −19

Original line number	Diff line number	Diff line
		@@ -158,6 +158,8 @@ func (m *Command) GetInputHash() string {
		type Copy struct {
		From *string `protobuf:"bytes,1,req,name=from" json:"from,omitempty"`
		To *string `protobuf:"bytes,2,req,name=to" json:"to,omitempty"`
		// If true, make the file executable after copying it.
		Executable *bool `protobuf:"varint,3,opt,name=executable" json:"executable,omitempty"`
		XXX_NoUnkeyedLiteral struct{} `json:"-"`
		XXX_unrecognized []byte `json:"-"`
		XXX_sizecache int32 `json:"-"`
		@@ -202,6 +204,13 @@ func (m *Copy) GetTo() string {
		return ""
		}

		func (m *Copy) GetExecutable() bool {
		if m != nil && m.Executable != nil {
		return *m.Executable
		}
		return false
		}

		func init() {
		proto.RegisterType((*Manifest)(nil), "sbox.Manifest")
		proto.RegisterType((*Command)(nil), "sbox.Command")
		@@ -213,21 +222,22 @@ func init() {
		}

		var fileDescriptor_9d0425bf0de86ed1 = []byte{
		// 252 bytes of a gzipped FileDescriptorProto
		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x41, 0x4b, 0xc3, 0x40,
		0x10, 0x85, 0x49, 0x9a, 0xd2, 0x66, 0x6a, 0x7b, 0x18, 0x3c, 0xec, 0x45, 0x08, 0x01, 0x21, 0x55,
		0xe8, 0xc1, 0x7f, 0x60, 0xf5, 0xe0, 0xc5, 0xcb, 0x1e, 0x45, 0x08, 0xdb, 0x64, 0x97, 0x04, 0x4c,
		0x66, 0xd9, 0xdd, 0x82, 0xfd, 0x57, 0xfe, 0x44, 0xd9, 0x49, 0xea, 0xc5, 0xdb, 0xcc, 0xfb, 0x78,
		0xf3, 0x1e, 0x03, 0xe0, 0x4f, 0xf4, 0x7d, 0xb0, 0x8e, 0x02, 0x61, 0x16, 0xe7, 0xf2, 0x13, 0xd6,
		0xef, 0x6a, 0xec, 0x8d, 0xf6, 0x01, 0xf7, 0xb0, 0x6e, 0x68, 0x18, 0xd4, 0xd8, 0x7a, 0x91, 0x14,
		0x8b, 0x6a, 0xf3, 0xb4, 0x3d, 0xb0, 0xe1, 0x65, 0x52, 0xe5, 0x1f, 0xc6, 0x7b, 0xd8, 0xd1, 0x39,
		0xd8, 0x73, 0xa8, 0x5b, 0x6d, 0x4d, 0xff, 0xa5, 0x45, 0x5a, 0x24, 0x55, 0x2e, 0xb7, 0x93, 0xfa,
		0x3a, 0x89, 0xe5, 0x4f, 0x02, 0xab, 0xd9, 0x8c, 0x8f, 0xb0, 0x69, 0xc8, 0x5e, 0xea, 0x93, 0x36,
		0xe4, 0xf4, 0x1c, 0x00, 0xd7, 0x00, 0x7b, 0x91, 0x10, 0xf1, 0x91, 0x29, 0xde, 0xc2, 0xb2, 0xe9,
		0xda, 0xde, 0xf1, 0xd9, 0xb5, 0x9c, 0x16, 0x14, 0xb0, 0x9a, 0x1b, 0x88, 0x45, 0x91, 0x56, 0xb9,
		0xbc, 0xae, 0xb8, 0x07, 0x76, 0xd7, 0xca, 0x04, 0xed, 0x44, 0xf6, 0xef, 0x76, 0x1e, 0xe9, 0x73,
		0x84, 0x78, 0x07, 0xd0, 0x8f, 0xb1, 0x79, 0xa7, 0x7c, 0x27, 0x96, 0x5c, 0x3b, 0x67, 0xe5, 0x4d,
		0xf9, 0xae, 0x7c, 0x80, 0x2c, 0x3a, 0x10, 0x21, 0x33, 0x8e, 0x06, 0x91, 0x70, 0x10, 0xcf, 0xb8,
		0x83, 0x34, 0x90, 0x48, 0x59, 0x49, 0x03, 0x1d, 0x6f, 0x3e, 0xf8, 0xa1, 0x35, 0x3f, 0xf4, 0x37,
		0x00, 0x00, 0xff, 0xff, 0x95, 0x4d, 0xee, 0x7d, 0x5d, 0x01, 0x00, 0x00,
		// 268 bytes of a gzipped FileDescriptorProto
		0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x4f, 0x4b, 0xc3, 0x40,
		0x10, 0xc5, 0xc9, 0x9f, 0xd2, 0x64, 0x6a, 0x7b, 0x18, 0x3c, 0xec, 0x45, 0x09, 0x01, 0x21, 0x45,
		0xe8, 0xc1, 0x6f, 0x60, 0xf5, 0x20, 0x82, 0x97, 0x1c, 0x45, 0x08, 0x9b, 0x64, 0x43, 0x02, 0x4d,
		0x26, 0xec, 0x6e, 0xa0, 0xfd, 0x56, 0x7e, 0x44, 0xd9, 0x49, 0x2a, 0x82, 0xb7, 0x99, 0xdf, 0xe3,
		0xcd, 0x7b, 0x0c, 0x80, 0x29, 0xe9, 0x7c, 0x18, 0x35, 0x59, 0xc2, 0xd0, 0xcd, 0xe9, 0x17, 0x44,
		0x1f, 0x72, 0xe8, 0x1a, 0x65, 0x2c, 0xee, 0x21, 0xaa, 0xa8, 0xef, 0xe5, 0x50, 0x1b, 0xe1, 0x25,
		0x41, 0xb6, 0x79, 0xda, 0x1e, 0xd8, 0xf0, 0x32, 0xd3, 0xfc, 0x57, 0xc6, 0x07, 0xd8, 0xd1, 0x64,
		0xc7, 0xc9, 0x16, 0xb5, 0x1a, 0x9b, 0xee, 0xa4, 0x84, 0x9f, 0x78, 0x59, 0x9c, 0x6f, 0x67, 0xfa,
		0x3a, 0xc3, 0xf4, 0xdb, 0x83, 0xf5, 0x62, 0xc6, 0x47, 0xd8, 0x54, 0x34, 0x5e, 0x8a, 0x52, 0x35,
		0xa4, 0xd5, 0x12, 0x00, 0xd7, 0x80, 0xf1, 0x92, 0x83, 0x93, 0x8f, 0xac, 0xe2, 0x2d, 0xac, 0xaa,
		0xb6, 0xee, 0x34, 0x9f, 0x8d, 0xf2, 0x79, 0x41, 0x01, 0xeb, 0xa5, 0x81, 0x08, 0x12, 0x3f, 0x8b,
		0xf3, 0xeb, 0x8a, 0x7b, 0x60, 0x77, 0x21, 0x1b, 0xab, 0xb4, 0x08, 0xff, 0xdd, 0x8e, 0x9d, 0xfa,
		0xec, 0x44, 0xbc, 0x03, 0xe8, 0x06, 0xd7, 0xbc, 0x95, 0xa6, 0x15, 0x2b, 0xae, 0x1d, 0x33, 0x79,
		0x93, 0xa6, 0x4d, 0xdf, 0x21, 0x74, 0x0e, 0x44, 0x08, 0x1b, 0x4d, 0xbd, 0xf0, 0x38, 0x88, 0x67,
		0xdc, 0x81, 0x6f, 0x49, 0xf8, 0x4c, 0x7c, 0x4b, 0x78, 0x0f, 0xa0, 0xce, 0xaa, 0x9a, 0xac, 0x2c,
		0x4f, 0x4a, 0x04, 0x5c, 0xf5, 0x0f, 0x39, 0xde, 0x7c, 0xf2, 0xc3, 0x0b, 0x7e, 0xf8, 0x4f, 0x00,
		0x00, 0x00, 0xff, 0xff, 0x78, 0x37, 0x3e, 0x6a, 0x7d, 0x01, 0x00, 0x00,
		}