diff options
Diffstat (limited to 'filesystem/system_other.go')
| -rw-r--r-- | filesystem/system_other.go | 35 |
1 files changed, 9 insertions, 26 deletions
diff --git a/filesystem/system_other.go b/filesystem/system_other.go index 32a6cc784..14895bd3f 100644 --- a/filesystem/system_other.go +++ b/filesystem/system_other.go @@ -23,6 +23,7 @@ import ( "time" "github.com/google/blueprint" + "github.com/google/blueprint/depset" "github.com/google/blueprint/proptools" ) @@ -93,7 +94,7 @@ func (m *systemOtherImage) GenerateAndroidBuildActions(ctx android.ModuleContext } output := android.PathForModuleOut(ctx, "system_other.img") - stagingDir := android.PathForModuleOut(ctx, "staging_dir") + stagingDir := android.PathForModuleOut(ctx, "system_other") stagingDirTimestamp := android.PathForModuleOut(ctx, "staging_dir.timestamp") builder := android.NewRuleBuilder(pctx, ctx) @@ -160,29 +161,17 @@ func (m *systemOtherImage) GenerateAndroidBuildActions(ctx android.ModuleContext builder.Build("build_system_other", "build system other") - // Create a hermetic system_other.img with pinned timestamps - builder = android.NewRuleBuilder(pctx, ctx) - outputHermetic := android.PathForModuleOut(ctx, "for_target_files", "system_other.img") - outputHermeticPropFile := m.propFileForHermeticImg(ctx, builder, propFile) - builder.Command(). - Textf("PATH=%s:$PATH", strings.Join(pathToolDirs, ":")). - BuiltTool("build_image"). - Text(stagingDir.String()). // input directory - Input(outputHermeticPropFile). - Implicits(systemInfo.BuildImagePropFileDeps). - Implicit(fec). - Implicit(stagingDirTimestamp). - Output(outputHermetic). - Text(stagingDir.String()) - - builder.Build("build_system_other_hermetic", "build system other") - fsInfo := FilesystemInfo{ Output: output, - OutputHermetic: outputHermetic, RootDir: stagingDir, + ModuleName: ctx.ModuleName(), FilesystemConfig: m.generateFilesystemConfig(ctx, stagingDir, stagingDirTimestamp), PropFileForMiscInfo: m.buildPropFileForMiscInfo(ctx), + InstalledFilesDepSet: depset.New( + depset.POSTORDER, + []InstalledFilesStruct{buildInstalledFiles(ctx, "system-other", stagingDir, output)}, + nil, + ), } android.SetProvider(ctx, FilesystemProvider, fsInfo) @@ -193,6 +182,7 @@ func (m *systemOtherImage) GenerateAndroidBuildActions(ctx android.ModuleContext // Dump compliance metadata complianceMetadataInfo := ctx.ComplianceMetadataInfo() complianceMetadataInfo.SetFilesContained(fullInstallPaths) + complianceMetadataInfo.SetPlatformGeneratedFiles(fullInstallPaths) } func (s *systemOtherImage) generateFilesystemConfig(ctx android.ModuleContext, stagingDir, stagingDirTimestamp android.Path) android.Path { @@ -209,13 +199,6 @@ func (s *systemOtherImage) generateFilesystemConfig(ctx android.ModuleContext, s return out } -func (f *systemOtherImage) propFileForHermeticImg(ctx android.ModuleContext, builder *android.RuleBuilder, inputPropFile android.Path) android.Path { - propFilePinnedTimestamp := android.PathForModuleOut(ctx, "for_target_files", "prop") - builder.Command().Textf("cat").Input(inputPropFile).Flag(">").Output(propFilePinnedTimestamp). - Textf(" && echo use_fixed_timestamp=true >> %s", propFilePinnedTimestamp) - return propFilePinnedTimestamp -} - func (f *systemOtherImage) buildPropFileForMiscInfo(ctx android.ModuleContext) android.Path { var lines []string addStr := func(name string, value string) { |