diff options
Diffstat (limited to 'filesystem')
| -rw-r--r-- | filesystem/android_device.go | 2 | ||||
| -rw-r--r-- | filesystem/filesystem.go | 33 |
2 files changed, 18 insertions, 17 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index eb2e0367a..7e31f0ec9 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -150,7 +150,7 @@ func (a *androidDevice) GenerateAndroidBuildActions(ctx android.ModuleContext) { } } - a.buildTargetFilesZip(ctx) + //a.buildTargetFilesZip(ctx) TODO(b/393203512): re-enable target_files.zip var deps []android.Path if proptools.String(a.partitionProps.Super_partition_name) != "" { superImage := ctx.GetDirectDepProxyWithTag(*a.partitionProps.Super_partition_name, superPartitionDepTag) diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 357ec32ba..815113ea3 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -738,22 +738,23 @@ func (f *filesystem) buildImageUsingBuildImage( Output(output). Text(rootDir.String()) // directory where to find fs_config_files|dirs + // TODO (b/393203512): Re-enable hermetic img file creation for target_files.zip // Add an additional cmd to create a hermetic img file. This will contain pinned timestamps e.g. - propFilePinnedTimestamp := android.PathForModuleOut(ctx, "for_target_files", "prop") - builder.Command().Textf("cat").Input(propFile).Flag(">").Output(propFilePinnedTimestamp). - Textf(" && echo use_fixed_timestamp=true >> %s", propFilePinnedTimestamp). - Textf(" && echo block_list=%s >> %s", f.getMapFile(ctx).String(), propFilePinnedTimestamp) // mapfile will be an implicit output - - outputHermetic := android.PathForModuleOut(ctx, "for_target_files", f.installFileName()) - builder.Command(). - Textf("PATH=%s:$PATH", strings.Join(pathToolDirs, ":")). - BuiltTool("build_image"). - Text(rootDir.String()). // input directory - Flag(propFilePinnedTimestamp.String()). - Implicits(toolDeps). - Implicit(fec). - Output(outputHermetic). - Text(rootDir.String()) // directory where to find fs_config_files|dirs + //propFilePinnedTimestamp := android.PathForModuleOut(ctx, "for_target_files", "prop") + //builder.Command().Textf("cat").Input(propFile).Flag(">").Output(propFilePinnedTimestamp). + // Textf(" && echo use_fixed_timestamp=true >> %s", propFilePinnedTimestamp). + // Textf(" && echo block_list=%s >> %s", f.getMapFile(ctx).String(), propFilePinnedTimestamp) // mapfile will be an implicit output + + //outputHermetic := android.PathForModuleOut(ctx, "for_target_files", f.installFileName()) + //builder.Command(). + // Textf("PATH=%s:$PATH", strings.Join(pathToolDirs, ":")). + // BuiltTool("build_image"). + // Text(rootDir.String()). // input directory + // Flag(propFilePinnedTimestamp.String()). + // Implicits(toolDeps). + // Implicit(fec). + // Output(outputHermetic). + // Text(rootDir.String()) // directory where to find fs_config_files|dirs if f.properties.Partition_size != nil { assertMaxImageSize(builder, output, *f.properties.Partition_size, false) @@ -762,7 +763,7 @@ func (f *filesystem) buildImageUsingBuildImage( // rootDir is not deleted. Might be useful for quick inspection. builder.Build("build_filesystem_image", fmt.Sprintf("Creating filesystem %s", f.BaseModuleName())) - return output, outputHermetic, propFile, toolDeps + return output, nil, propFile, toolDeps } func (f *filesystem) buildFileContexts(ctx android.ModuleContext) android.Path { |