diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-11-08 15:42:25 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-11-09 09:12:47 +0000 |
| commit | 216410b2b45e31c56ad28c61f9523c4d8a984a94 (patch) | |
| tree | 4f5e48dea5e8079afcf39ffc09dce430f621a85d /tools/android | |
| parent | 4a1e14f8e06f978332a00c00b45a0387287d8c2e (diff) | |
Make aar_embedded_jar_extractor.py not try to recreate the output directory.
--
MOS_MIGRATED_REVID=138516288
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/aar_embedded_jars_extractor.py | 2 | ||||
| -rw-r--r-- | tools/android/aar_embedded_jars_extractor_test.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/android/aar_embedded_jars_extractor.py b/tools/android/aar_embedded_jars_extractor.py index 22326ef152..e631c48186 100644 --- a/tools/android/aar_embedded_jars_extractor.py +++ b/tools/android/aar_embedded_jars_extractor.py @@ -18,7 +18,6 @@ An AAR may contain JARs at /classes.jar and /libs/*.jar. This tool extracts all of the jars and creates a param file for singlejar to merge them into one jar. """ -import os import re import sys import zipfile @@ -37,7 +36,6 @@ gflags.MarkFlagAsRequired("output_dir") def ExtractEmbeddedJars(aar, singlejar_param_file, output_dir): - os.makedirs(output_dir) jar_pattern = re.compile("^(classes|libs/.+)\\.jar$") singlejar_param_file.write("--exclude_build_data\n") for name in aar.namelist(): diff --git a/tools/android/aar_embedded_jars_extractor_test.py b/tools/android/aar_embedded_jars_extractor_test.py index 9f4dca3a24..30f150e850 100644 --- a/tools/android/aar_embedded_jars_extractor_test.py +++ b/tools/android/aar_embedded_jars_extractor_test.py @@ -35,6 +35,7 @@ class AarEmbeddedJarsExtractor(unittest.TestCase): def testNoJars(self): aar = zipfile.ZipFile(StringIO.StringIO(), "w") param_file = StringIO.StringIO() + os.makedirs("out_dir") aar_embedded_jars_extractor.ExtractEmbeddedJars(aar, param_file, "out_dir") self.assertEqual([], os.listdir("out_dir")) param_file.seek(0) @@ -46,6 +47,7 @@ class AarEmbeddedJarsExtractor(unittest.TestCase): aar.writestr("libs/a.jar", "") aar.writestr("libs/b.jar", "") param_file = StringIO.StringIO() + os.makedirs("out_dir") aar_embedded_jars_extractor.ExtractEmbeddedJars(aar, param_file, "out_dir") self.assertItemsEqual(["classes.jar", "libs"], os.listdir("out_dir")) self.assertItemsEqual(["a.jar", "b.jar"], os.listdir("out_dir/libs")) @@ -64,6 +66,7 @@ class AarEmbeddedJarsExtractor(unittest.TestCase): aar = zipfile.ZipFile(StringIO.StringIO(), "w") aar.writestr("classes.jar", "") param_file = StringIO.StringIO() + os.makedirs("out_dir") aar_embedded_jars_extractor.ExtractEmbeddedJars(aar, param_file, "out_dir") self.assertEqual(["classes.jar"], os.listdir("out_dir")) param_file.seek(0) |