summaryrefslogtreecommitdiff
path: root/tools/aapt2/integration-tests
diff options
context:
space:
mode:
authorWinson <chiuwinson@google.com>2019-01-23 12:39:40 -0800
committerWinson <chiuwinson@google.com>2019-01-24 16:10:16 -0800
commitf54c9a1d72aa3f307e6d78b7f9221354d72fc6e1 (patch)
tree664f1f24f58a89a407724aebdf85135eae396190 /tools/aapt2/integration-tests
parent3b943e777e57c6f3c7351c23daea2f12ac8ea928 (diff)
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
Diffstat (limited to 'tools/aapt2/integration-tests')
-rw-r--r--tools/aapt2/integration-tests/ConvertTest/duplicate_entries.apkbin0 -> 15141221 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/tools/aapt2/integration-tests/ConvertTest/duplicate_entries.apk b/tools/aapt2/integration-tests/ConvertTest/duplicate_entries.apk
new file mode 100644
index 000000000000..c558a334b369
--- /dev/null
+++ b/tools/aapt2/integration-tests/ConvertTest/duplicate_entries.apk
Binary files differ