diff options
| author | Colin Cross <ccross@android.com> | 2018-09-13 11:26:19 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-09-13 18:28:03 +0000 |
| commit | cedd4768f58eab69cfbce8c2dc599d83a0c7dd26 (patch) | |
| tree | 553b8eb33b0663b12a80420a3945503d5a1d6be0 /java/java_resources.go | |
| parent | fe4bc36f87b9d4f529bfd486b89176f3f3045323 (diff) | |
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
Diffstat (limited to 'java/java_resources.go')
| -rw-r--r-- | java/java_resources.go | 4 |
1 files changed, 3 insertions, 1 deletions
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 { |