Merge "Fix std::unique_ptr error with incomplete CommonFeatureGroup" into aosp-main-future (63cfd0e9) · Commits · e / os / android_frameworks_base

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);