diff options
| author | 2019-03-20 12:48:15 -0700 | |
|---|---|---|
| committer | 2019-03-20 12:48:15 -0700 | |
| commit | 055d480456518a0000af118a0821398287e1c786 (patch) | |
| tree | ed7ac13de6f378aa29f2cd86967e4c98ddd369e2 /java/java_resources.go | |
| parent | 5bbf0dda95ddfd8f12a153f0c70cd691f8791829 (diff) | |
| parent | 734ad216fed881ffc20203404c570eb9e29dcf02 (diff) | |
Remove ModuleSrcPath am: 07e51619a2
am: 734ad216fe
Change-Id: I0d11c34f99116f08054cfd1cfb5abc7102c9700d
Diffstat (limited to 'java/java_resources.go')
| -rw-r--r-- | java/java_resources.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/java_resources.go b/java/java_resources.go index 6c1fd39d0..462296302 100644 --- a/java/java_resources.go +++ b/java/java_resources.go @@ -39,10 +39,10 @@ func ResourceDirsToJarArgs(ctx android.ModuleContext, var excludeFiles []string for _, exclude := range excludeResourceDirs { - dirs := ctx.Glob(android.PathForModuleSrc(ctx).Join(ctx, exclude).String(), nil) + dirs := ctx.Glob(android.PathForSource(ctx, ctx.ModuleDir()).Join(ctx, exclude).String(), nil) for _, dir := range dirs { excludeDirs = append(excludeDirs, dir.String()) - excludeFiles = append(excludeFiles, dir.(android.ModuleSrcPath).Join(ctx, "**/*").String()) + excludeFiles = append(excludeFiles, dir.(android.SourcePath).Join(ctx, "**/*").String()) } } @@ -52,7 +52,7 @@ func ResourceDirsToJarArgs(ctx android.ModuleContext, for _, resourceDir := range resourceDirs { // resourceDir may be a glob, resolve it first - dirs := ctx.Glob(android.PathForModuleSrc(ctx).Join(ctx, resourceDir).String(), excludeDirs) + dirs := ctx.Glob(android.PathForSource(ctx, ctx.ModuleDir()).Join(ctx, resourceDir).String(), excludeDirs) for _, dir := range dirs { files := ctx.GlobFiles(filepath.Join(dir.String(), "**/*"), excludeFiles) |