diff options
| author | 2019-06-12 20:19:55 +0000 | |
|---|---|---|
| committer | 2019-06-12 20:19:55 +0000 | |
| commit | 72ea641dffd8b6d037d1529ea6946c726a624f14 (patch) | |
| tree | 23aa2259de0717b13259ee789fd80ec0ac8ce085 /android/paths.go | |
| parent | 733728b42cfdf02ba8ecd41f17c470efdda7b4b8 (diff) | |
| parent | dc35e21124b684087aeb66fb74e9ca43f0e7c741 (diff) | |
Merge changes Ia17b2bcb,Ic71892c3,Id2b23b9e,I435ee7aa,I85112506, ...
* changes:
Consolidate *MutatorContext and ModuleContext into BaseModuleContext
Add test for missing defaults modules with AllowMissingDependencies
Capture missing dependency error rules
Share buildDir for android/soong/android tests
Reimplement AddMissingDependencies
Add GenerateAndroidBuildActions to DefaultsModuleBase
Diffstat (limited to 'android/paths.go')
| -rw-r--r-- | android/paths.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/paths.go b/android/paths.go index 52d22d531..20b8b823c 100644 --- a/android/paths.go +++ b/android/paths.go @@ -367,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 = "" |