diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2015-06-10 14:00:02 +0200 |
|---|---|---|
| committer | Benoit Lamarche <benoitlamarche@google.com> | 2015-06-18 17:24:57 +0200 |
| commit | 0da769c991d2713f60e9aca2dc05462dc02c2731 (patch) | |
| tree | abe905e29379d8fb44950f985c014b9bc2579cc2 /jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java | |
| parent | 784b47fa3e631462e7e0a28f5c6439a8891db785 (diff) | |
| download | toolchain_jack-0da769c991d2713f60e9aca2dc05462dc02c2731.tar.gz toolchain_jack-0da769c991d2713f60e9aca2dc05462dc02c2731.tar.bz2 toolchain_jack-0da769c991d2713f60e9aca2dc05462dc02c2731.zip | |
Add addMetaDir(File) in JackBasedToolchain
Bug: 21722784
(cherry picked from commit 459a4a32942aec2634967cd54cace98452d478f2)
Change-Id: Ia19cd3687da55af6f62299f17100ddabebae86c7
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 | 10 |
1 files changed, 10 insertions, 0 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 fdcfedcb..b9de0416 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/JackCliToolchain.java @@ -163,6 +163,11 @@ public class JackCliToolchain extends JackBasedToolchain { args.add(res.getPath()); } + for (File meta : metaImport) { + args.add("--import-meta"); + args.add(meta.getPath()); + } + args.addAll(extraJackArgs); for (File jarjarFile : jarjarRules) { @@ -266,6 +271,11 @@ public class JackCliToolchain extends JackBasedToolchain { args.add(res.getPath()); } + for (File meta : metaImport) { + args.add("--import-meta"); + args.add(meta.getPath()); + } + addProperties(properties, args); if (!classpath.equals("")) { |