diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-05-11 17:54:05 +0200 |
|---|---|---|
| committer | Jean-Marie Henaff <jmhenaff@google.com> | 2015-05-12 11:14:06 +0200 |
| commit | a18689e31b6c26e62a457f9976de4d72a6ba197c (patch) | |
| tree | 97787e2872913c2abea656d12c33a3b6d4b8f03f /jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java | |
| parent | dc6de5d3bbbc226aba567add67781fc10befb333 (diff) | |
| download | toolchain_jack-a18689e31b6c26e62a457f9976de4d72a6ba197c.tar.gz toolchain_jack-a18689e31b6c26e62a457f9976de4d72a6ba197c.tar.bz2 toolchain_jack-a18689e31b6c26e62a457f9976de4d72a6ba197c.zip | |
Modify Api01Config and Jack to support multiple Jarjar config files
Bug: 20913411
(cherry picked from commit 517dec6fa299a3755f38681b3fcea387c84873f0)
Change-Id: If9c1e8f827e8ed3fd68c4999a8700608a95ce7c9
Diffstat (limited to 'jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java')
| -rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java index b8d565b1..fdcfedcb 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java @@ -165,9 +165,9 @@ public class JackCliToolchain extends JackBasedToolchain { args.addAll(extraJackArgs); - if (jarjarRules != null) { + for (File jarjarFile : jarjarRules) { args.add("--config-jarjar"); - args.add(jarjarRules.getAbsolutePath()); + args.add(jarjarFile.getAbsolutePath()); } for (File flags : proguardFlags) { @@ -273,9 +273,9 @@ public class JackCliToolchain extends JackBasedToolchain { args.add(classpath); } - if (jarjarRules != null) { + for (File jarjarFile : jarjarRules) { args.add("--config-jarjar"); - args.add(jarjarRules.getAbsolutePath()); + args.add(jarjarFile.getAbsolutePath()); } for (File flags : proguardFlags) { |