summaryrefslogtreecommitdiff
path: root/tools/aapt2/cmd/Convert_test.cpp
AgeCommit message (Collapse)Author
2019-06-17Move off ZipString and over to std::string/std::string_view as appropriate.Elliott Hughes
Bug: http://b/129068177 Test: treehugger Change-Id: Ib46761d89772d3a3c655a39df573fd305c117d19
2019-05-11Don't explicitly specify no prefix/suffix.Elliott Hughes
Bug: http://b/129068177 Test: treehugger Change-Id: Ica29efa3c3e49f556157cb0f82fdadef91aadba8
2019-01-25Merge "De-duplicate entries written with AAPT2 convert"TreeHugger Robot
2019-01-24De-duplicate entries written with AAPT2 convertWinson
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
2019-01-23Hold data pointer reference to AAPT2 test fileWinson
To try and solve test flakiness, hold the unique_ptr in the method scope to make sure it's cleaned up after we assert on it. Bug: 123079798 Test: gonna merge and check for failures, since it passes locally Change-Id: Id348d1112832cbb82f605a84ef675c25a7488b11
2019-01-03Remove raw values from proto APKRyan Mitchell
Raw attribute values are not included in xml files when building binary APKs but they are when building proto APKs. Remove raw attribute values and create a new convert flag that (--keep-raw-values) that allows raw value to be kept. Also added flag to link to keep raw attribute values. Bug: 115915884 Bug: 116700688 Test: aapt2_tests Change-Id: Id50136b775b3f43d159ca06181282f6a7b8eaf40