diff options
| author | 2019-06-10 16:38:11 +0000 | |
|---|---|---|
| committer | 2019-06-10 16:38:11 +0000 | |
| commit | a6bf56d4bede80f1942d775a22f15bdc0d33e37a (patch) | |
| tree | 0c61bc58e74650c98924ab38a1e52944f02d35a2 /android/paths.go | |
| parent | 50e91c1a7a93077989cc590ea3878c46b3df4ba8 (diff) | |
| parent | 7e0a2cb590f2f2d117571327f40fa8557363658c (diff) | |
Merge changes I9f8df94f,I2d7f5c56,I0ebb7381,Ieefcfc1a
* changes:
Consolidate *MutatorContext and ModuleContext into BaseModuleContext
Consolidate baseContext, BaseContext, and BaseModuleContext
Rename ModuleBase receivers
Remove repetition in android package names
Diffstat (limited to 'android/paths.go')
| -rw-r--r-- | android/paths.go | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/android/paths.go b/android/paths.go index 3915ff414..20b8b823c 100644 --- a/android/paths.go +++ b/android/paths.go @@ -41,9 +41,7 @@ var _ PathContext = SingletonContext(nil) var _ PathContext = ModuleContext(nil) type ModuleInstallPathContext interface { - PathContext - - androidBaseContext + BaseModuleContext InstallInData() bool InstallInSanitizerDir() bool @@ -369,7 +367,7 @@ func expandOneSrcPath(ctx ModuleContext, s string, expandedExcludes []string) (P // each string. If incDirs is false, strip paths with a trailing '/' from the list. // It intended for use in globs that only list files that exist, so it allows '$' in // filenames. -func pathsForModuleSrcFromFullPath(ctx ModuleContext, paths []string, incDirs bool) Paths { +func pathsForModuleSrcFromFullPath(ctx BaseModuleContext, paths []string, incDirs bool) Paths { prefix := filepath.Join(ctx.Config().srcDir, ctx.ModuleDir()) + "/" if prefix == "./" { prefix = "" |