From 05a39cbaccebf8ab0cd44116c4dca2db37424c58 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 9 Oct 2017 13:35:19 -0700 Subject: [PATCH] Fix mixing genrule dependencies with globs Putting a genrule dependency after a glob in a srcs property was causing the generated files to be treated as globbed files and hitting an interface conversion panic. Bug: 67364649 Test: TestGeneratedSources in later patch Change-Id: I8a076c9998fdd07e53769922be433a793ca575a9 --- android/module.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/module.go b/android/module.go index 2890b604f..9d7f9420c 100644 --- a/android/module.go +++ b/android/module.go @@ -882,10 +882,10 @@ func (ctx *androidModuleContext) ExpandSourcesSubDir(srcFiles, excludes []string } } else if pathtools.IsGlob(s) { globbedSrcFiles := ctx.Glob(filepath.Join(prefix, s), excludes) - expandedSrcFiles = append(expandedSrcFiles, globbedSrcFiles...) - for i, s := range expandedSrcFiles { - expandedSrcFiles[i] = s.(ModuleSrcPath).WithSubDir(ctx, subDir) + for i, s := range globbedSrcFiles { + globbedSrcFiles[i] = s.(ModuleSrcPath).WithSubDir(ctx, subDir) } + expandedSrcFiles = append(expandedSrcFiles, globbedSrcFiles...) } else { s := PathForModuleSrc(ctx, s).WithSubDir(ctx, subDir) expandedSrcFiles = append(expandedSrcFiles, s)