Merge "Allow jarjar_rules to be arch-specific"

am: fa86d794b0

Change-Id: I90057e51e66e74f3eb2f41d0908c0cab9ab76bd9
This commit is contained in:
Colin Cross
2017-10-18 10:43:13 +00:00
committed by android-build-merger

View File

@@ -100,7 +100,7 @@ type CompilerProperties struct {
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