diff options
| author | 2017-10-06 00:54:19 +0000 | |
|---|---|---|
| committer | 2017-10-06 00:54:19 +0000 | |
| commit | 9d7bee729a82b581a10654025c8b84ebcc5f37e8 (patch) | |
| tree | 4508a04fb47d67bba9151c0a4a45d47cac84d229 /java/java.go | |
| parent | c21d11850d6b6edaa461c9e06efa3d005da08ce2 (diff) | |
| parent | 2372923fe0d14b3adf4e6f217e0cf7bdb2c211e1 (diff) | |
Merge "Honor resource exclusions in java_resources properties"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go index 3726435e9..bab77c5a6 100644 --- a/java/java.go +++ b/java/java.go @@ -481,7 +481,7 @@ func (j *Module) compile(ctx android.ModuleContext) { resDeps = append(resDeps, fileDeps...) if proptools.Bool(j.properties.Include_srcs) { - srcArgs, srcDeps := ResourceFilesToJarArgs(ctx, j.properties.Srcs, j.properties.Exclude_srcs) + srcArgs, srcDeps := SourceFilesToJarArgs(ctx, j.properties.Srcs, j.properties.Exclude_srcs) resArgs = append(resArgs, srcArgs...) resDeps = append(resDeps, srcDeps...) } |