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

Commit c2aff9e9 authored by Sally Yuen's avatar Sally Yuen Committed by Colin Cross
Browse files

Revert "Speed up vendor snapshot header globs" 

This reverts commit 0f93e5b9.

Reason for revert: causing extra soong regenerations

Change-Id: I4ed2e5c82dfe3e99fbb9590b80f92c79a27e8025
parent 758140ce

cc/library.go

+13 −27
Original line number Diff line number Diff line
@@ -449,37 +449,23 @@ func (l *libraryDecorator) collectHeadersForSnapshot(ctx android.ModuleContext) 
			}

			continue

		}

		glob, err := ctx.GlobWithDeps(dir+"/**/*", nil)

		exts := headerExts

		// Glob all files under this special directory, because of C++ headers.

		if strings.HasPrefix(dir, "external/libcxx/include") {

			exts = []string{""}

		}

		for _, ext := range exts {

			glob, err := ctx.GlobWithDeps(dir+"/**/*"+ext, nil)

			if err != nil {

				ctx.ModuleErrorf("glob failed: %#v", err)

				return

			}

		isLibcxx := strings.HasPrefix(dir, "external/libcxx/include")

		j := 0

		for i, header := range glob {

			if isLibcxx {

				// Glob all files under this special directory, because of C++ headers with no

				// extension.

				if !strings.HasSuffix(header, "/") {

					continue

				}

			} else {

				// Filter out only the files with extensions that are headers.

				found := false

				for _, ext := range headerExts {

					if strings.HasSuffix(header, ext) {

						found = true

						break

					}

				}

				if !found {

			for _, header := range glob {

				if strings.HasSuffix(header, "/") {

					continue

				}

				ret = append(ret, android.PathForSource(ctx, header))

			}

			if i != j {

				glob[j] = glob[i]

			}

			j++

		}

	}