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/LegacyJillToolchain.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/LegacyJillToolchain.java')
| -rw-r--r-- | jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java index 8592ee68..98004b41 100644 --- a/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java +++ b/jack-tests/src/com/android/jack/test/toolchain/LegacyJillToolchain.java @@ -114,7 +114,7 @@ public class LegacyJillToolchain extends JillBasedToolchain { if (resImport.size() > 0) { resDestDir = new File(classesDir, FileType.RSC.getPrefix()); if (!resDestDir.exists() && !resDestDir.mkdir()) { - throw new AssertionError("Could not create rsc dir"); + throw new AssertionError("Could not create resource dir"); } for (File res : resImport) { @@ -122,6 +122,18 @@ public class LegacyJillToolchain extends JillBasedToolchain { } } + File metaDestDir; + if (metaImport.size() > 0) { + metaDestDir = new File(classesDir, FileType.JPP.getPrefix()); + if (!metaDestDir.exists() && !metaDestDir.mkdir()) { + throw new AssertionError("Could not create meta dir"); + } + + for (File meta : metaImport) { + AbstractTestTools.copyDirectory(meta, metaDestDir); + } + } + File tmpJarsDir = AbstractTestTools.createTempDir(); File jarFile = new File(tmpJarsDir, "legacyLib.jar"); File jarFileJarjar = new File(tmpJarsDir, "legacyLibJarjar.jar"); |
