diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/android/module.go b/android/module.go index 6c7fc6505..c479b596b 100644 --- a/android/module.go +++ b/android/module.go @@ -1290,7 +1290,7 @@ func (b *baseModuleContext) AddUnconvertedBp2buildDep(dep string) { // GetUnconvertedBp2buildDeps returns the list of module names of this module's direct dependencies that // were not converted to Bazel. func (m *ModuleBase) GetUnconvertedBp2buildDeps() []string { - return m.commonProperties.UnconvertedBp2buildDeps + return FirstUniqueStrings(m.commonProperties.UnconvertedBp2buildDeps) } func (m *ModuleBase) AddJSONData(d *map[string]interface{}) { @@ -2096,18 +2096,18 @@ func (e *earlyModuleContext) GlobFiles(globPattern string, excludes []string) Pa return GlobFiles(e, globPattern, excludes) } -func (b *earlyModuleContext) IsSymlink(path Path) bool { - fileInfo, err := b.config.fs.Lstat(path.String()) +func (e *earlyModuleContext) IsSymlink(path Path) bool { + fileInfo, err := e.config.fs.Lstat(path.String()) if err != nil { - b.ModuleErrorf("os.Lstat(%q) failed: %s", path.String(), err) + e.ModuleErrorf("os.Lstat(%q) failed: %s", path.String(), err) } return fileInfo.Mode()&os.ModeSymlink == os.ModeSymlink } -func (b *earlyModuleContext) Readlink(path Path) string { - dest, err := b.config.fs.Readlink(path.String()) +func (e *earlyModuleContext) Readlink(path Path) string { + dest, err := e.config.fs.Readlink(path.String()) if err != nil { - b.ModuleErrorf("os.Readlink(%q) failed: %s", path.String(), err) + e.ModuleErrorf("os.Readlink(%q) failed: %s", path.String(), err) } return dest } |