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

Commit c87f6adc authored by Wei Li's avatar Wei Li Committed by Gerrit Code Review
Browse files

Merge "Ignore METADATA files in python packages shipped with prebuilts/clang,... 

Merge "Ignore METADATA files in python packages shipped with prebuilts/clang, which are from upstream and not in the format used in Android." into main
parents eba15b66 ae3c12ba

ui/build/finder.go

+14 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ func FindSources(ctx Context, config Config, f *finder.Finder) { 


	// Recursively look for all METADATA files.

	metadataFiles := f.FindNamedAt(".", "METADATA")

	metadataFiles = ignoreNonAndroidMetadataFiles(metadataFiles)

	err = dumpListToFile(ctx, config, metadataFiles, filepath.Join(dumpDir, "METADATA.list"))

	if err != nil {

		ctx.Fatalf("Could not find METADATA: %v", err)
@@ -223,3 +224,16 @@ func dumpListToFile(ctx Context, config Config, list []string, filePath string) 


	return nil

}



func ignoreNonAndroidMetadataFiles(metadataFiles []string) []string {

	result := make([]string, 0, len(metadataFiles))

	for _, file := range metadataFiles {

		// Ignore files like prebuilts/clang/host/linux-x86/clang-r536225/python3/lib/python3.11/site-packages/pip-23.1.2.dist-info/METADATA

		// these METADATA files are from upstream and are not the METADATA files used in Android codebase.

		if strings.Contains(file, "prebuilts/clang/host/") && strings.Contains(file, "/site-packages/") {

			continue

		}

		result = append(result, file)

	}

	return result

}