diff options
| author | 2018-09-13 22:49:21 +0000 | |
|---|---|---|
| committer | 2018-09-13 22:49:21 +0000 | |
| commit | ec06db2709040ec56b55e272fa541b35b9d45fdf (patch) | |
| tree | 03d300d3923703815f50c72c8ee3b58e81c128a5 /java/java.go | |
| parent | 9c69a126d5a4254ec007157b97ba1c32e0df2433 (diff) | |
| parent | cedd4768f58eab69cfbce8c2dc599d83a0c7dd26 (diff) | |
Merge changes from topic "hostdex"
* changes:
Allow exclude_java_resources to affect java_resource_dirs
Allow '$' in some paths
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index b60f9c739..4bf5880bc 100644 --- a/java/java.go +++ b/java/java.go @@ -75,7 +75,7 @@ type CompilerProperties struct { // list of files to use as Java resources Java_resources []string `android:"arch_variant"` - // list of files that should be excluded from java_resources + // list of files that should be excluded from java_resources and java_resource_dirs Exclude_java_resources []string `android:"arch_variant"` // don't build against the default libraries (bootclasspath, legacy-test, core-junit, @@ -1119,7 +1119,8 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path } } - dirArgs, dirDeps := ResourceDirsToJarArgs(ctx, j.properties.Java_resource_dirs, j.properties.Exclude_java_resource_dirs) + dirArgs, dirDeps := ResourceDirsToJarArgs(ctx, j.properties.Java_resource_dirs, + j.properties.Exclude_java_resource_dirs, j.properties.Exclude_java_resources) fileArgs, fileDeps := ResourceFilesToJarArgs(ctx, j.properties.Java_resources, j.properties.Exclude_java_resources) var resArgs []string |