OSDN Git Service

De-duplicate entries written with AAPT2 convert
authorWinson <chiuwinson@google.com>
Wed, 23 Jan 2019 20:39:40 +0000 (12:39 -0800)
committerWinson <chiuwinson@google.com>
Fri, 25 Jan 2019 00:10:16 +0000 (16:10 -0800)
commitf54c9a1d72aa3f307e6d78b7f9221354d72fc6e1
tree664f1f24f58a89a407724aebdf85135eae396190
parent3b943e777e57c6f3c7351c23daea2f12ac8ea928
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
tools/aapt2/cmd/Convert.cpp
tools/aapt2/cmd/Convert_test.cpp
tools/aapt2/integration-tests/ConvertTest/duplicate_entries.apk [new file with mode: 0644]