Merge branch 'am-gradle_update' into try-merging-gradle-7-change

Author: jonsimantov

CMakeLists.txt

@@ -236,23 +236,19 @@ if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
   # In case there are multiple matches, take the one with the newest timestamp.
   set(newest_timestamp 0)
   foreach(possible_prev_build_dir IN LISTS possible_prev_build_dirs)
-    message("CONSIDERING ${possible_prev_build_dir}")
     if(IS_DIRECTORY ${possible_prev_build_dir})
       if(EXISTS "${possible_prev_build_dir}/${header_to_scan_for}")
         # Check if it's newer than any other files.
-        message("FOUND ${possible_prev_build_dir}/${header_to_scan_for}")
         file(TIMESTAMP "${possible_prev_build_dir}/${header_to_scan_for}" timestamp "%s")
-	message("GOT TIMESTAMP: ${timestamp}")
         if(${timestamp} GREATER ${newest_timestamp})
-          message("USING ${possible_prev_build_dir}")
           set(APP_BINARY_DIR ${possible_prev_build_dir})
           set(newest_timestamp ${timestamp})
         endif()
       endif()
     endif()
   endforeach()
   if (IS_DIRECTORY "${APP_BINARY_DIR}")
-    message("Found previous Firebase App build in ${APP_BINARY_DIR}")
+    message(STATUS "Found previous Firebase App build in ${APP_BINARY_DIR}")
   else()
     message(FATAL_ERROR "Could not find previous Firebase App build under ${prev_build_path}")
   endif()

android_build_files/generate_proguard.gradle

@@ -72,7 +72,7 @@ def defineGenerateProguardFile(String subproject, String buildType,
       String nativeBuildDir =
           project.android.externalNativeBuild.cmake.buildStagingDirectory
       if (nativeBuildDir == null || nativeBuildDir.isEmpty()) {
-        nativeBuildDir = file('.cxx/cmake').absolutePath
+        nativeBuildDir = file('.cxx').absolutePath
       }
 
       // Find the static library that was built. Note that there are multiple

build_scripts/android/package.sh

@@ -1,4 +1,4 @@
-#!/bin/bash -e
+#!/bin/bash -ex
 
 # Copyright 2020 Google LLC
 
@@ -34,10 +34,12 @@ mkdir -p "${destpath}/libs/android"
 cd "${sourcepath}"
 # Make sure we only copy the libraries in product_list (specified in packaging.conf)
 for product in ${product_list[*]}; do
-    if [[ ! -d "${product}/build/intermediates/cmake/release/obj" ]]; then
+    if [[ ! -d "${product}/build/intermediates/cxx" ]]; then
 	continue
     fi
-    dir="${product}/build/intermediates/cmake/release/obj"
+    # Get the most recent matching intermediate files directory.
+    dir=$(ls -td "${product}"/build/intermediates/cxx/Rel*/*/obj | head -1)
+    echo "${dir}"
     for cpudir in "${dir}"/*; do
 	cpu=$(basename ${cpudir})
 	libsrc="${sourcepath}/${cpudir}/libfirebase_${product}.a"
@@ -49,7 +51,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-release"*.aar "${destpath}/libs/android/firebase_messaging_cpp.aar"
     fi
 done
 cd "${origpath}"