commit f54c9a1d72aa3f307e6d78b7f9221354d72fc6e1
author Winson <chiuwinson@google.com> Wed Jan 23 12:39:40 2019 -0800
committer Winson <chiuwinson@google.com> Thu Jan 24 16:10:16 2019 -0800
tree 664f1f24f58a89a407724aebdf85135eae396190
parent 3b943e777e57c6f3c7351c23daea2f12ac8ea928

De-duplicate entries written with AAPT2 convert

There was no check for whether we had already written a specific file path to the APK when using the convert command.

If the resources table points 2 resource IDs at the same file on disk, the convert command would write the file twice, creating two entries.

This holds a set of file paths already written and ignores duplicates.

Bug: 123271593

Test: Ran convert on linked bug's weird.apk
Test: aapt2_tests case for duplicate entries

Change-Id: Ia22515bf8e8297624aaadbf6a9e47159026c63e5

tools/aapt2/Android.bp

diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 7783e10..8f75287 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -182,7 +182,8 @@
     defaults: ["aapt2_defaults"],
     data: [
          "integration-tests/CompileTest/**/*",
-         "integration-tests/CommandTests/**/*"
+         "integration-tests/CommandTests/**/*",
+         "integration-tests/ConvertTest/**/*"
     ],
 }