From fe1904bb2a771efbc0328f33e8555575739c8abf Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Wed, 4 May 2022 20:22:09 -0700
Subject: [PATCH 1/2] Fix packaging workflow to use new name for
 messaging_java.aar.

(Actually just use a wildcard in case it changes again.)
---
 build_scripts/android/package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/android/package.sh b/build_scripts/android/package.sh
index 553b9aca56..fcd468ddb2 100755
--- a/build_scripts/android/package.sh
+++ b/build_scripts/android/package.sh
@@ -49,7 +49,7 @@ for product in ${product_list[*]}; do
     cp -f "${sourcepath}/${product}/build/Release/${product}.pro" "${destpath}/libs/android/"
     # Copy the special messaging aar file, but only if messaging was built.
     if [[ "${product}" == "messaging" ]]; then
-        cp -f "${sourcepath}/messaging/messaging_java/build/outputs/aar/messaging_java-release.aar" "${destpath}/libs/android/firebase_messaging_cpp.aar"
+        cp -f "${sourcepath}/messaging/messaging_java/build/outputs/aar/messaging_java*.aar" "${destpath}/libs/android/firebase_messaging_cpp.aar"
     fi
 done
 cd "${origpath}"

From 9c8af65605d42dcaf9a2362eeb2b9fc5a96ef8f9 Mon Sep 17 00:00:00 2001
From: Jon Simantov <jsimantov@google.com>
Date: Wed, 4 May 2022 20:23:18 -0700
Subject: [PATCH 2/2] Fix wildcard usage

---
 build_scripts/android/package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_scripts/android/package.sh b/build_scripts/android/package.sh
index fcd468ddb2..30d98a52dd 100755
--- a/build_scripts/android/package.sh
+++ b/build_scripts/android/package.sh
@@ -49,7 +49,7 @@ for product in ${product_list[*]}; do
     cp -f "${sourcepath}/${product}/build/Release/${product}.pro" "${destpath}/libs/android/"
     # Copy the special messaging aar file, but only if messaging was built.
     if [[ "${product}" == "messaging" ]]; then
-        cp -f "${sourcepath}/messaging/messaging_java/build/outputs/aar/messaging_java*.aar" "${destpath}/libs/android/firebase_messaging_cpp.aar"
+        cp -f "${sourcepath}/messaging/messaging_java/build/outputs/aar/messaging_java"*.aar "${destpath}/libs/android/firebase_messaging_cpp.aar"
     fi
 done
 cd "${origpath}"