diff options
| author | 2019-08-09 00:12:27 +0000 | |
|---|---|---|
| committer | 2019-08-09 00:12:27 +0000 | |
| commit | a48f8c8070d870daa8acd2e24795843b533abd4a (patch) | |
| tree | 048e6007119d694a613497711b367a1d91b37a49 /java/java.go | |
| parent | 08f92625778131b442d2520ca01183df52ac2928 (diff) | |
| parent | 2d975b197e136ac1ac9267f76a903855ff2d4619 (diff) | |
Merge changes I918b4878,I85238d93,Iefee8a91
* changes:
Add an output file tag for proguard dictionaries
Add InstallBypassMake
Document wokaround for yama ptrace restrictions
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index fea38b51f..3b789f689 100644 --- a/java/java.go +++ b/java/java.go @@ -370,6 +370,8 @@ func (j *Module) OutputFiles(tag string) (android.Paths, error) { return append(android.Paths{j.outputFile}, j.extraOutputFiles...), nil case ".jar": return android.Paths{j.implementationAndResourcesJar}, nil + case ".proguard_map": + return android.Paths{j.proguardDictionary}, nil default: return nil, fmt.Errorf("unsupported module reference tag %q", tag) } |