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

Commit 9f6be6b7 authored by Liz Kammer's avatar Liz Kammer Committed by Automerger Merge Worker
Browse files

Merge "Refactor android/paths.go to allow reuse" am: bd52e94c 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1496657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I05aedc7dc65d4bbae07c8c10ff44f8383ff306cb
parents 16f751c2 bd52e94c

android/module.go

+2 −10
Original line number Diff line number Diff line
@@ -1885,19 +1885,11 @@ type earlyModuleContext struct { 
}



func (e *earlyModuleContext) Glob(globPattern string, excludes []string) Paths {

	ret, err := e.GlobWithDeps(globPattern, excludes)

	if err != nil {

		e.ModuleErrorf("glob: %s", err.Error())

	}

	return pathsForModuleSrcFromFullPath(e, ret, true)

	return Glob(e, globPattern, excludes)

}



func (e *earlyModuleContext) GlobFiles(globPattern string, excludes []string) Paths {

	ret, err := e.GlobWithDeps(globPattern, excludes)

	if err != nil {

		e.ModuleErrorf("glob: %s", err.Error())

	}

	return pathsForModuleSrcFromFullPath(e, ret, false)

	return GlobFiles(e, globPattern, excludes)

}



func (b *earlyModuleContext) IsSymlink(path Path) bool {

android/paths.go

+133 −72

File changed.

Preview size limit exceeded, changes collapsed.