diff options
| -rw-r--r-- | android/config.go | 4 | ||||
| -rw-r--r-- | filesystem/aconfig_files.go | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/android/config.go b/android/config.go index e51976054..a2bf53336 100644 --- a/android/config.go +++ b/android/config.go @@ -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. diff --git a/filesystem/aconfig_files.go b/filesystem/aconfig_files.go index 8af2ffaab..608fccdad 100644 --- a/filesystem/aconfig_files.go +++ b/filesystem/aconfig_files.go @@ -76,10 +76,13 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder * cmd.ImplicitOutput(outputPath) f.appendToEntry(ctx, outputPath) } - generatePartitionAconfigStorageFile("package_map", "package.map") - generatePartitionAconfigStorageFile("flag_map", "flag.map") - generatePartitionAconfigStorageFile("flag_val", "flag.val") - generatePartitionAconfigStorageFile("flag_info", "flag.info") + + 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()) } |