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

Commit e1ddcc9d authored by Paul Duffin's avatar Paul Duffin
Browse files

Only check copy rules into the snapshot directory

Test: m nothing
Change-Id: I6d9ab5a9f003193c5791a4ee6d3ee35730ddf96c
parent 68e7d4a2
Loading
Loading
Loading
Loading
+11 −6
Original line number Diff line number Diff line
@@ -188,15 +188,20 @@ func (r *testSdkResult) getSdkSnapshotBuildInfo(sdk *sdk) *snapshotBuildInfo {

	buildParams := sdk.BuildParamsForTests()
	copyRules := &strings.Builder{}
	snapshotDirPrefix := sdk.builderForTests.snapshotDir.String() + "/"
	for _, bp := range buildParams {
		switch bp.Rule.String() {
		case android.Cp.String():
			output := bp.Output
			// Only check copies into the snapshot directory.
			if strings.HasPrefix(output.String(), snapshotDirPrefix) {
				// Get source relative to build directory.
				src := android.NormalizePathForTesting(bp.Input)
				// Get destination relative to the snapshot root
			dest := bp.Output.Rel()
				dest := output.Rel()
				_, _ = fmt.Fprintf(copyRules, "%s -> %s\n", src, dest)
				info.snapshotContents = append(info.snapshotContents, dest)
			}

		case repackageZip.String():
			// Add the destdir to the snapshot contents as that is effectively where