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

Commit 3d9b69e9 authored by Spandan Das's avatar Spandan Das
Browse files

Use RELEASE_CREATE_ACONFIG_STORAGE_FILE to create aconfig files 

This matches the kati packaging system implementation

Test: verified that these files do not appear in `fileList` of
generic_system_image when building with a TARGET_RELEASE that is not
`trunk_staging` or `trunk`
Bug: 369678122

Change-Id: Ieb585a8e1d20bc939fddfad9bafcecaaf767fa4e
parent b9b3915d

android/config.go

+4 −0
Original line number Diff line number Diff line
@@ -287,6 +287,10 @@ func (c Config) ReleaseReadFromNewStorage() bool { 
	return c.config.productVariables.GetBuildFlagBool("RELEASE_READ_FROM_NEW_STORAGE")

}



func (c Config) ReleaseCreateAconfigStorageFile() bool {

	return c.config.productVariables.GetBuildFlagBool("RELEASE_CREATE_ACONFIG_STORAGE_FILE")

}



// A DeviceConfig object represents the configuration for a particular device

// being built. For now there will only be one of these, but in the future there

// may be multiple devices being built.

filesystem/aconfig_files.go

+7 −4
Original line number Diff line number Diff line
@@ -76,10 +76,13 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder * 
		cmd.ImplicitOutput(outputPath)

		f.appendToEntry(ctx, outputPath)

	}



	if ctx.Config().ReleaseCreateAconfigStorageFile() {

		generatePartitionAconfigStorageFile("package_map", "package.map")

		generatePartitionAconfigStorageFile("flag_map", "flag.map")

		generatePartitionAconfigStorageFile("flag_val", "flag.val")

		generatePartitionAconfigStorageFile("flag_info", "flag.info")

	}



	android.WriteExecutableFileRuleVerbatim(ctx, aconfigFlagsBuilderPath, sb.String())

}