Merge "Add --enable-compact-entries to aapt2 convert" into main (d6c45131) · Commits · e / os / android_frameworks_base

tools/aapt2/cmd/Convert.cpp

+1 −0

Original line number	Diff line number	Diff line
		@@ -425,6 +425,7 @@ int ConvertCommand::Action(const std::vector<std::string>& args) {
		if (force_sparse_encoding_) {
		table_flattener_options_.sparse_entries = SparseEntriesMode::Forced;
		}
		table_flattener_options_.use_compact_entries = enable_compact_entries_;
		if (resources_config_path_) {
		if (!ExtractResourceConfig(*resources_config_path_, &context, table_flattener_options_)) {
		return 1;

+5 −0

Original line number	Diff line number	Diff line
		@@ -46,6 +46,10 @@ class ConvertCommand : public Command {
		"This decreases APK size at the cost of resource retrieval performance.\n"
		"Applies sparse encoding to all resources regardless of minSdk.",
		&force_sparse_encoding_);
		AddOptionalSwitch(
		"--enable-compact-entries",
		"This decreases APK size by using compact resource entries for simple data types.",
		&enable_compact_entries_);
		AddOptionalSwitch("--keep-raw-values",
		android::base::StringPrintf("Preserve raw attribute values in xml files when using the"
		" '%s' output format", kOutputFormatBinary),
		@@ -85,6 +89,7 @@ class ConvertCommand : public Command {
		bool verbose_ = false;
		bool enable_sparse_encoding_ = false;
		bool force_sparse_encoding_ = false;
		bool enable_compact_entries_ = false;
		std::optional<std::string> resources_config_path_;
		};