diff options
author | Ryan Prichard <rprichard@google.com> | 2024-05-07 19:17:06 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-07 19:17:06 +0000 |
commit | 681514f345d922080e1b7f0888e55f35f500d32c (patch) | |
tree | 655ea5a0d7f8772dc7613843dbe6a99a2474f81d | |
parent | b3a939eb8213eda840344b5bb7c313b69d351231 (diff) | |
parent | cbcff7405526456f64e4140bb7576de2c3a54f72 (diff) | |
download | base-681514f345d922080e1b7f0888e55f35f500d32c.tar.gz |
Merge "aapt2: fix dangling reference to diag" into main
-rw-r--r-- | tools/aapt2/link/ManifestFixer.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/aapt2/link/ManifestFixer.cpp b/tools/aapt2/link/ManifestFixer.cpp index b56b4c455d35..57459e363868 100644 --- a/tools/aapt2/link/ManifestFixer.cpp +++ b/tools/aapt2/link/ManifestFixer.cpp @@ -441,7 +441,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, android::IDiagn manifest_action.Action(AutoGenerateIsSplitRequired); manifest_action.Action(VerifyManifest); manifest_action.Action(FixCoreAppAttribute); - manifest_action.Action([&](xml::Element* el) -> bool { + manifest_action.Action([this, diag](xml::Element* el) -> bool { EnsureNamespaceIsDeclared("android", xml::kSchemaAndroid, &el->namespace_decls); if (options_.version_name_default) { @@ -504,7 +504,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, android::IDiagn manifest_action["eat-comment"]; // Uses-sdk actions. - manifest_action["uses-sdk"].Action([&](xml::Element* el) -> bool { + manifest_action["uses-sdk"].Action([this](xml::Element* el) -> bool { if (options_.min_sdk_version_default && el->FindAttribute(xml::kSchemaAndroid, "minSdkVersion") == nullptr) { // There was no minSdkVersion defined and we have a default to assign. @@ -526,7 +526,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, android::IDiagn // Instrumentation actions. manifest_action["instrumentation"].Action(RequiredNameIsJavaClassName); - manifest_action["instrumentation"].Action([&](xml::Element* el) -> bool { + manifest_action["instrumentation"].Action([this](xml::Element* el) -> bool { if (!options_.rename_instrumentation_target_package) { return true; } @@ -542,7 +542,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, android::IDiagn manifest_action["attribution"]; manifest_action["attribution"]["inherit-from"]; manifest_action["original-package"]; - manifest_action["overlay"].Action([&](xml::Element* el) -> bool { + manifest_action["overlay"].Action([this](xml::Element* el) -> bool { if (options_.rename_overlay_target_package) { if (xml::Attribute* attr = el->FindAttribute(xml::kSchemaAndroid, "targetPackage")) { attr->value = options_.rename_overlay_target_package.value(); @@ -623,7 +623,7 @@ bool ManifestFixer::BuildRules(xml::XmlActionExecutor* executor, android::IDiagn uses_package_action["additional-certificate"]; if (options_.debug_mode) { - application_action.Action([&](xml::Element* el) -> bool { + application_action.Action([](xml::Element* el) -> bool { xml::Attribute *attr = el->FindOrCreateAttribute(xml::kSchemaAndroid, "debuggable"); attr->value = "true"; return true; |