Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d652155 authored by Yurii Zubrytskyi's avatar Yurii Zubrytskyi Committed by Android (Google) Code Review
Browse files

Merge "[aapt2] Remove unneeded virtual from LoadedApk" into main

parents a4f574d9 711edbdb
Loading
Loading
Loading
Loading
+6 −8
Original line number Diff line number Diff line
@@ -40,10 +40,8 @@ enum ApkFormat {
};

// Info about an APK loaded in memory.
class LoadedApk {
class LoadedApk final {
 public:
  virtual ~LoadedApk() = default;

  // Loads both binary and proto APKs from disk.
  static std::unique_ptr<LoadedApk> LoadApkFromPath(android::StringPiece path,
                                                    android::IDiagnostics* diag);
@@ -96,7 +94,7 @@ class LoadedApk {
   * Writes the APK on disk at the given path, while also removing the resource
   * files that are not referenced in the resource table.
   */
  virtual bool WriteToArchive(IAaptContext* context, const TableFlattenerOptions& options,
  bool WriteToArchive(IAaptContext* context, const TableFlattenerOptions& options,
                      IArchiveWriter* writer);

  /**
@@ -108,7 +106,7 @@ class LoadedApk {
   * original manifest will be written. The manifest is only required if the contents of the new APK
   * have been modified in a way that require the AndroidManifest.xml to also be modified.
   */
  virtual bool WriteToArchive(IAaptContext* context, ResourceTable* split_table,
  bool WriteToArchive(IAaptContext* context, ResourceTable* split_table,
                      const TableFlattenerOptions& options, FilterChain* filters,
                      IArchiveWriter* writer, xml::XmlResource* manifest = nullptr);