From e0388de6bed42778b89b1ed5b61455cc47a751e8 Mon Sep 17 00:00:00 2001 From: Mohamed Heikal Date: Wed, 18 Mar 2020 13:19:57 -0400 Subject: Enable --collapse-resource-names on bundles This cl enables aapt2 optimize and convert to handle collapsed resource names optimization. Test: make aapt2_test Change-Id: I160d7e5bbd94580b52c00b648918e47beb4674f1 --- tools/aapt2/LoadedApk.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'tools/aapt2/LoadedApk.cpp') diff --git a/tools/aapt2/LoadedApk.cpp b/tools/aapt2/LoadedApk.cpp index 45719ef474cd..e930b47f2901 100644 --- a/tools/aapt2/LoadedApk.cpp +++ b/tools/aapt2/LoadedApk.cpp @@ -267,8 +267,14 @@ bool LoadedApk::WriteToArchive(IAaptContext* context, ResourceTable* split_table return false; } } else if (format_ == ApkFormat::kProto && path == kProtoResourceTablePath) { + SerializeTableOptions proto_serialize_options; + proto_serialize_options.collapse_key_stringpool = + options.collapse_key_stringpool; + proto_serialize_options.name_collapse_exemptions = + options.name_collapse_exemptions; pb::ResourceTable pb_table; - SerializeTableToPb(*split_table, &pb_table, context->GetDiagnostics()); + SerializeTableToPb(*split_table, &pb_table, context->GetDiagnostics(), + proto_serialize_options); if (!io::CopyProtoToArchive(context, &pb_table, path, -- cgit v1.2.3-59-g8ed1b