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

Commit edd1ca90 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12348750 from 3ec447b6 to 24Q4-release 

Change-Id: I77a4d904e8eeb3f82a469a6521403b7927f3ab53
parents c5905072 3ec447b6

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -1828,10 +1828,6 @@ func (c *deviceConfig) BuildBrokenTrebleSyspropNeverallow() bool { 
	return c.config.productVariables.BuildBrokenTrebleSyspropNeverallow

}



func (c *deviceConfig) BuildBrokenUsesSoongPython2Modules() bool {

	return c.config.productVariables.BuildBrokenUsesSoongPython2Modules

}



func (c *deviceConfig) BuildDebugfsRestrictionsEnabled() bool {

	return c.config.productVariables.BuildDebugfsRestrictionsEnabled

}

android/variable.go

+0 −1
Original line number Diff line number Diff line
@@ -445,7 +445,6 @@ type ProductVariables struct { 
	GenruleSandboxing                   *bool    `json:",omitempty"`

	BuildBrokenEnforceSyspropOwner      bool     `json:",omitempty"`

	BuildBrokenTrebleSyspropNeverallow  bool     `json:",omitempty"`

	BuildBrokenUsesSoongPython2Modules  bool     `json:",omitempty"`

	BuildBrokenVendorPropertyNamespace  bool     `json:",omitempty"`

	BuildBrokenIncorrectPartitionImages bool     `json:",omitempty"`

	BuildBrokenInputDirModules          []string `json:",omitempty"`

filesystem/filesystem.go

+13 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ type filesystemProperties struct { 
	// Install aconfig_flags.pb file for the modules installed in this partition.

	Gen_aconfig_flags_pb *bool



	// Update the Base_dir of the $PRODUCT_OUT directory with the packaging files.

	Update_product_out *bool



	Fsverity fsverityProperties

}
@@ -331,6 +334,14 @@ func (f *filesystem) copyPackagingSpecs(ctx android.ModuleContext, builder *andr 
	return f.CopySpecsToDirs(ctx, builder, dirsToSpecs)

}



func (f *filesystem) copyFilesToProductOut(ctx android.ModuleContext, builder *android.RuleBuilder, rebasedDir android.OutputPath) {

	if !proptools.Bool(f.properties.Update_product_out) {

		return

	}

	installPath := android.PathForModuleInPartitionInstall(ctx, f.partitionName())

	builder.Command().Textf("cp -prf %s/* %s", rebasedDir, installPath)

}



func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) android.OutputPath {

	rootDir := android.PathForModuleOut(ctx, "root").OutputPath

	rebasedDir := rootDir
@@ -348,6 +359,7 @@ func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) androi 
	f.buildFsverityMetadataFiles(ctx, builder, specs, rootDir, rebasedDir)

	f.buildEventLogtagsFile(ctx, builder, rebasedDir)

	f.buildAconfigFlagsFiles(ctx, builder, specs, rebasedDir)

	f.copyFilesToProductOut(ctx, builder, rebasedDir)



	// run host_init_verifier

	// Ideally we should have a concept of pluggable linters that verify the generated image.
@@ -490,6 +502,7 @@ func (f *filesystem) buildCpioImage(ctx android.ModuleContext, compressed bool) 
	f.buildFsverityMetadataFiles(ctx, builder, specs, rootDir, rebasedDir)

	f.buildEventLogtagsFile(ctx, builder, rebasedDir)

	f.buildAconfigFlagsFiles(ctx, builder, specs, rebasedDir)

	f.copyFilesToProductOut(ctx, builder, rebasedDir)



	output := android.PathForModuleOut(ctx, f.installFileName()).OutputPath

	cmd := builder.Command().

genrule/allowlists.go

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ package genrule 
var (

	SandboxingDenyModuleList = []string{

		// go/keep-sorted start

		"com.google.pixel.camera.hal.manifest",

		// go/keep-sorted end

	}

)

python/python.go

+2 −3
Original line number Diff line number Diff line
@@ -264,10 +264,9 @@ func (versionSplitTransitionMutator) Split(ctx android.BaseModuleContext) []stri 
			variants = append(variants, pyVersion3)

		}

		if proptools.BoolDefault(props.Version.Py2.Enabled, false) {

			if !ctx.DeviceConfig().BuildBrokenUsesSoongPython2Modules() &&

				ctx.ModuleName() != "py2-cmd" &&

			if ctx.ModuleName() != "py2-cmd" &&

				ctx.ModuleName() != "py2-stdlib" {

				ctx.PropertyErrorf("version.py2.enabled", "Python 2 is no longer supported, please convert to python 3. This error can be temporarily overridden by setting BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES := true in the product configuration")

				ctx.PropertyErrorf("version.py2.enabled", "Python 2 is no longer supported, please convert to python 3.")

			}

			variants = append(variants, pyVersion2)

		}