Merge "Soong system image may update the $PRODUCT_OUT" into main (6fab06d5) · Commits · e / os / android_build_soong

android/config.go

+11 −0

Original line number	Diff line number	Diff line
		@@ -1663,6 +1663,17 @@ func (c *config) ApexTrimEnabled() bool {
		return Bool(c.productVariables.TrimmedApex)
		}

		func (c *config) UseSoongSystemImage() bool {
		return Bool(c.productVariables.UseSoongSystemImage)
		}

		func (c *config) SoongDefinedSystemImage() string {
		if c.UseSoongSystemImage() {
		return String(c.productVariables.ProductSoongDefinedSystemImage)
		}
		return ""
		}

		func (c *config) EnforceSystemCertificate() bool {
		return Bool(c.productVariables.EnforceSystemCertificate)
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -423,6 +423,9 @@ type ProductVariables struct {

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

		UseSoongSystemImage *bool `json:",omitempty"`
		ProductSoongDefinedSystemImage *string `json:",omitempty"`

		EnforceProductPartitionInterface *bool `json:",omitempty"`

		EnforceInterPartitionJavaSdkLibrary *bool `json:",omitempty"`

+1 −4

Original line number	Diff line number	Diff line
		@@ -136,9 +136,6 @@ 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
		}

		@@ -335,7 +332,7 @@ func (f filesystem) copyPackagingSpecs(ctx android.ModuleContext, builder andr
		}

		func (f filesystem) copyFilesToProductOut(ctx android.ModuleContext, builder android.RuleBuilder, rebasedDir android.OutputPath) {
		if !proptools.Bool(f.properties.Update_product_out) {
		if f.Name() != ctx.Config().SoongDefinedSystemImage() {
		return
		}
		installPath := android.PathForModuleInPartitionInstall(ctx, f.partitionName())