Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AAPT2: Produce Conditional Proguard Keep Rules

Browse Source 
Add the option to produce keep rules that conditional keep based on
usage of R identifiers. This allows Proguard to potentially shrink more
code if resources are not used.

Currently only produces conditional rules for classes referenced in
layout resources because they are the most common and has the easiest
transitive usage chain to analyze.

Bug: 63628451
Test: make aapt2_tests and manual testing
Change-Id: I6c1af7affd64af40c80e004d8506a9463444b2c3
This commit is contained in:
Adam Koski
2017-07-21 10:55:27 -07:00
parent 0d769d80a9
commit dc21dea9b8
6 changed files with 324 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aapt2/java/JavaClassGenerator.cpp
View File

@@ -61,7 +61,7 @@ static bool IsValidSymbol(const StringPiece& symbol) {
// Java symbols can not contain . or -, but those are valid in a resource name.
// Replace those with '_'.
static std::string TransformToFieldName(const StringPiece& symbol) {
std::string JavaClassGenerator::TransformToFieldName(const StringPiece& symbol) {
std::string output = symbol.to_string();
for (char& c : output) {
if (c == '.' || c == '-') {
@@ -89,9 +89,9 @@ static std::string TransformNestedAttr(const ResourceNameRef& attr_name,
// the package.
if (!attr_name.package.empty() &&
package_name_to_generate != attr_name.package) {
output += "_" + TransformToFieldName(attr_name.package);
output += "_" + JavaClassGenerator::TransformToFieldName(attr_name.package);
}
output += "_" + TransformToFieldName(attr_name.entry);
output += "_" + JavaClassGenerator::TransformToFieldName(attr_name.entry);
return output;
}