| commit | fa86d794b0e92bbe5f8d8f7ab0daf434e5dbe7b2 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Oct 18 09:41:11 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Oct 18 09:41:11 2017 +0000 |
| tree | 4a19888069879ec8e7af0a58af765649730b41fb | |
| parent | db58c63807bbd53aa356b97bfc990a8c4d925f16 [diff] | |
| parent | 975f9f79ff01ba0e4cdd78a64675a01ad486db04 [diff] |
Merge "Allow jarjar_rules to be arch-specific"
diff --git a/java/java.go b/java/java.go index 3382cf2..76e574e 100644 --- a/java/java.go +++ b/java/java.go
@@ -100,7 +100,7 @@ Manifest *string // if not blank, run jarjar using the specified rules file - Jarjar_rules *string + Jarjar_rules *string `android:"arch_variant"` // If not blank, set the java version passed to javac as -source and -target Java_version *string