commit 549938a17f0ba8b6a6fa109deea227a52c793cc4
author Iurii Makhno <iuriimak@google.com> Tue Apr 26 19:36:51 2022 +0000
committer Iurii Makhno <iuriimak@google.com> Tue Apr 26 19:42:40 2022 +0000
tree 10fd6b3a8776b7069c3a098b26960c7a971b8351
parent d6233c3f24f098b94d32424eded8b3215d8f0d24

Fix '--enable-sparse-encoding' support for convert command.

Bug: b/182565055
Test: existing
Change-Id: I63f411b14c0f270450f0bca846b12ad2e5111d72

tools/aapt2/cmd/Convert.cpp

diff --git a/tools/aapt2/cmd/Convert.cpp b/tools/aapt2/cmd/Convert.cpp
index 3b097e0..d8c541d 100644
--- a/tools/aapt2/cmd/Convert.cpp
+++ b/tools/aapt2/cmd/Convert.cpp
@@ -18,11 +18,10 @@
 
 #include <vector>
 
-#include "android-base/macros.h"
-#include "androidfw/StringPiece.h"
-
 #include "LoadedApk.h"
 #include "ValueVisitor.h"
+#include "android-base/macros.h"
+#include "androidfw/StringPiece.h"
 #include "cmd/Util.h"
 #include "format/binary/TableFlattener.h"
 #include "format/binary/XmlFlattener.h"
@@ -240,7 +239,7 @@
   }
 
   int GetMinSdkVersion() override {
-    return 0u;
+    return min_sdk_;
   }
 
   const std::set<std::string>& GetSplitNameDependencies() override {
@@ -251,6 +250,7 @@
 
   bool verbose_ = false;
   std::string package_;
+  int32_t min_sdk_ = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Context);
@@ -373,6 +373,7 @@
   }
 
   context.package_ = app_info.value().package;
+  context.min_sdk_ = app_info.value().min_sdk_version.value_or(0);
   unique_ptr<IArchiveWriter> writer = CreateZipFileArchiveWriter(context.GetDiagnostics(),
                                                                  output_path_);
   if (writer == nullptr) {