From eaed50ea2093495d5e80d4c5864471ecf3001ded Mon Sep 17 00:00:00 2001
From: maade93791 <70593890+maade69@users.noreply.github.com>
Date: Sat, 15 Aug 2026 22:07:04 +0300
Subject: [PATCH] aapt2: handle preview target SDK codenames in
 brief-package-info

CP31 ShannonIms declares targetSdkVersion="CinnamonBun" resuling in adevtool fail
---
 tools/aapt2/cmd/Dump.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tools/aapt2/cmd/Dump.cpp b/tools/aapt2/cmd/Dump.cpp
index 2f2d661e8b7b9..10e86e77daa8d 100644
--- a/tools/aapt2/cmd/Dump.cpp
+++ b/tools/aapt2/cmd/Dump.cpp
@@ -22,6 +22,7 @@
 #include "Debug.h"
 #include "Diagnostics.h"
 #include "LoadedApk.h"
+#include "SdkConstants.h"
 #include "Util.h"
 #include "ValueVisitor.h"
 #include "android-base/stringprintf.h"
@@ -446,6 +447,10 @@ int DumpBriefPackageInfo::Action(const std::vector<std::string>& args) {
       xml::Attribute* target_sdk = manifest_child->FindAttribute(xml::kSchemaAndroid, "targetSdkVersion");
       if (target_sdk == nullptr) {
         bpi.set_target_sdk(std::stoi(sdk_version_));
+      } else if (target_sdk->compiled_value == nullptr) {
+        const auto version = GetDevelopmentSdkCodeNameVersion(target_sdk->value);
+        CHECK(version.has_value());
+        bpi.set_target_sdk(*version);
       } else {
         bpi.set_target_sdk(GetIntAttr(*target_sdk));
       }