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

Commit cc36feb0 authored by Justin Yun's avatar Justin Yun
Browse files

Update aconfig storage generation function 

aconfig storage files are generated from aconfig_flags.pb instead of
all cache files with the aosp/3277171 change.

Bug: 381019197
Test: build gsi_arm64_soong_system && compare system images
Change-Id: Id2f698fdb2a2cbd7b15457be0fe898236ef33fee
parent b385f9eb

filesystem/aconfig_files.go

+5 −2
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder * 
	sb.WriteString(aconfigToolPath.String())

	sb.WriteString(" dump-cache --dedup --format protobuf --out ")

	sb.WriteString(installAconfigFlagsPath.String())

	sb.WriteString(" --filter container:")

	sb.WriteString(f.PartitionType())

	sb.WriteString(" \\\n")

	sb.WriteString(sbCaches.String())

	cmd.ImplicitOutput(installAconfigFlagsPath)
@@ -71,8 +73,9 @@ func (f *filesystem) buildAconfigFlagsFiles(ctx android.ModuleContext, builder * 
		sb.WriteString(fileType)

		sb.WriteString(" --out ")

		sb.WriteString(outputPath.String())

		sb.WriteString(" \\\n")

		sb.WriteString(sbCaches.String())

		sb.WriteString(" --cache ")

		sb.WriteString(installAconfigFlagsPath.String())

		sb.WriteRune('\n')

		cmd.ImplicitOutput(outputPath)

		f.appendToEntry(ctx, outputPath)

	}