summaryrefslogtreecommitdiff
path: root/java/java_resources.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2019-03-20 12:48:29 -0700
committer android-build-merger <android-build-merger@google.com> 2019-03-20 12:48:29 -0700
commit3cafca1d18a9438c6f49378a5af641f23f28d1e1 (patch)
tree69a57f74d62a78a22712d3714c7c13b1dcad231c /java/java_resources.go
parent055d480456518a0000af118a0821398287e1c786 (diff)
parent9bcee1f400034e4a782b2dd393a3af5f0e3edd4a (diff)
Replace ctx.ExpandSources with android.PathsForModuleSrc am: 8a49795df1
am: 9bcee1f400 Change-Id: Ie94f2abc0526f8121e1edf3230bd63134e552ff2
Diffstat (limited to 'java/java_resources.go')
-rw-r--r--java/java_resources.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java_resources.go b/java/java_resources.go
index 462296302..71611689a 100644
--- a/java/java_resources.go
+++ b/java/java_resources.go
@@ -46,7 +46,7 @@ func ResourceDirsToJarArgs(ctx android.ModuleContext,
}
}
- excludeFiles = append(excludeFiles, ctx.ExpandSources(excludeResourceFiles, nil).Strings()...)
+ excludeFiles = append(excludeFiles, android.PathsForModuleSrc(ctx, excludeResourceFiles).Strings()...)
excludeFiles = append(excludeFiles, resourceExcludes...)
@@ -96,7 +96,7 @@ func SourceFilesToJarArgs(ctx android.ModuleContext,
func resourceFilesToJarArgs(ctx android.ModuleContext,
res, exclude []string) (args []string, deps android.Paths) {
- files := ctx.ExpandSources(res, exclude)
+ files := android.PathsForModuleSrcExcludes(ctx, res, exclude)
lastDir := ""
for i, f := range files {