From cedd4768f58eab69cfbce8c2dc599d83a0c7dd26 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 13 Sep 2018 11:26:19 -0700 Subject: Allow exclude_java_resources to affect java_resource_dirs Allow excluding files from directory globbed by java_resource_dirs. Test: java_test.go Change-Id: I9922842248be1a386ab111a5187608438638ffb1 --- java/java_resources.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'java/java_resources.go') diff --git a/java/java_resources.go b/java/java_resources.go index e02709dc0..fdc159063 100644 --- a/java/java_resources.go +++ b/java/java_resources.go @@ -32,7 +32,7 @@ var resourceExcludes = []string{ } func ResourceDirsToJarArgs(ctx android.ModuleContext, - resourceDirs, excludeResourceDirs []string) (args []string, deps android.Paths) { + resourceDirs, excludeResourceDirs, excludeResourceFiles []string) (args []string, deps android.Paths) { var excludeDirs []string var excludeFiles []string @@ -44,6 +44,8 @@ func ResourceDirsToJarArgs(ctx android.ModuleContext, } } + excludeFiles = append(excludeFiles, ctx.ExpandSources(excludeResourceFiles, nil).Strings()...) + excludeFiles = append(excludeFiles, resourceExcludes...) for _, resourceDir := range resourceDirs { -- cgit v1.2.3-59-g8ed1b