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

Commit 190fefc8 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "Fix std::unique_ptr error with incomplete CommonFeatureGroup" into... 

Merge "Fix std::unique_ptr error with incomplete CommonFeatureGroup" into aosp-main-future am: 63cfd0e9 am: c51ed80b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24685129



Change-Id: I8a7bbaeadb049830e77ccb23045122275a7d6aa3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 79e14414 c51ed80b

tools/aapt2/dump/DumpManifest.cpp

+8 −4
Original line number Diff line number Diff line
@@ -216,9 +216,7 @@ class SupportsScreen; 


class ManifestExtractor {

 public:



  explicit ManifestExtractor(LoadedApk* apk, DumpManifestOptions& options)

      : apk_(apk), options_(options) { }

  explicit ManifestExtractor(LoadedApk* apk, DumpManifestOptions& options);



  class Element {

   public:
@@ -509,7 +507,7 @@ class ManifestExtractor { 


 private:

  std::unique_ptr<xml::XmlResource> doc_;

  std::unique_ptr<CommonFeatureGroup> commonFeatureGroup_ = util::make_unique<CommonFeatureGroup>();

  std::unique_ptr<CommonFeatureGroup> commonFeatureGroup_;

  std::map<std::string, ConfigDescription> locales_;

  std::map<uint16_t, ConfigDescription> densities_;

  std::vector<Element*> parent_stack_;
@@ -2471,6 +2469,12 @@ static void ToProto(ManifestExtractor::Element* el, pb::Badging* out_badging) { 
  }

}



// Define this constructor after the CommonFeatureGroup class definition to avoid errors with using

// std::unique_ptr on an incomplete type.

ManifestExtractor::ManifestExtractor(LoadedApk* apk, DumpManifestOptions& options)

    : apk_(apk), options_(options), commonFeatureGroup_(util::make_unique<CommonFeatureGroup>()) {

}



bool ManifestExtractor::Extract(android::IDiagnostics* diag) {

  // Load the manifest

  doc_ = apk_->LoadXml("AndroidManifest.xml", diag);