Change APP_BINARY_DIR to instead scan for the directory.

Author: jonsimantov

CMakeLists.txt

@@ -180,6 +180,7 @@ endif()
 # Set directories needed by the Firebase subprojects
 # Directory to store generated files.
 set(FIREBASE_GEN_FILE_DIR ${CMAKE_BINARY_DIR}/generated)
+
 # Directory for any shared scripts.
 set(FIREBASE_SCRIPT_DIR ${CMAKE_CURRENT_LIST_DIR})
 
@@ -227,20 +228,34 @@ set(FIRESTORE_INCLUDE_OBJC OFF CACHE BOOL "Disabled for the CPP SDK")
 set(RE2_BUILD_TESTING OFF CACHE BOOL "")
 
 if(FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
-  # Quote meta characters in ${CMAKE_CURRENT_LIST_DIR} so we can
-  # match it in a regex.
-  # For example, '/path/with/+meta/char.acters' will become
-  # '/path/with/\+meta/char\.acters'.
-  string(REGEX REPLACE
-         "([][+.*()^])" "\\\\\\1"  # Yes, this many \'s is correct.
-         current_list_dir_regex
-         "${CMAKE_CURRENT_LIST_DIR}")
-  # Figure out where app's binary_dir was.
-  string(REGEX REPLACE
-    "${current_list_dir_regex}/[^/]+/(.*)"
-    "${CMAKE_CURRENT_LIST_DIR}/app/\\1"
-    APP_BINARY_DIR "${FIREBASE_BINARY_DIR}")
-
+  # Gradle now adds a random hash to each separate NDK cmake build.
+  # Scan the previously built directories to find the one containing app's header.
+  set(header_to_scan_for "generated/app/src/include/firebase/version.h")
+  set(prev_build_path "${CMAKE_BINARY_DIR}/../../../../../app/.cxx/${CMAKE_BUILD_TYPE}/*/${CMAKE_ANDROID_ARCH_ABI}")
+  file(GLOB possible_prev_build_dirs "${prev_build_path}")
+  # 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}")
+  else()
+    message(FATAL_ERROR "Could not find previous Firebase App build under ${prev_build_path}")
+  endif()
   set(FIRESTORE_SOURCE_DIR ${APP_BINARY_DIR}/external/src/firestore)
 else()
   # Run the CMake build logic that will download all the external dependencies.
@@ -579,6 +594,7 @@ if(NOT FIREBASE_CPP_USE_PRIOR_GRADLE_BUILD)
 else()
   # Add firebase_app as a target on the previously built app.
   add_library(firebase_app STATIC IMPORTED GLOBAL)
+
   file(MAKE_DIRECTORY "${APP_BINARY_DIR}/generated")
   file(MAKE_DIRECTORY "${FIREBASE_BINARY_DIR}/generated")
   set(app_include_dirs

analytics/CMakeLists.txt

@@ -16,6 +16,7 @@
 
 # Analytics generates header files for default events, parameters, and
 # properties based on the iOS SDK, that are used across all platforms.
+
 set(analytics_generated_headers_dir
     "${FIREBASE_GEN_FILE_DIR}/analytics/src/include/firebase/analytics")
 set(event_names_header "${analytics_generated_headers_dir}/event_names.h")

analytics/build.gradle

@@ -85,4 +85,5 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('analytics')
+  preBuild.dependsOn(':app:build')
 }

functions/build.gradle

@@ -84,4 +84,6 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('functions')
+  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
+  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
 }

gma/build.gradle

@@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('gma')
   setupDexDependencies(':gma:gma_resources')
+  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
+  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
 }

installations/build.gradle

@@ -84,4 +84,6 @@ apply from: "$rootDir/android_build_files/android_abis.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('installations')
+  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
+  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
 }

messaging/build.gradle

@@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/extract_and_dex.gradle"
 apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('messaging')
+  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
+  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
 }

remote_config/build.gradle

@@ -86,4 +86,6 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('remote_config')
   setupDexDependencies(':remote_config:remote_config_resources')
+  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
+  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
 }

storage/build.gradle

@@ -86,4 +86,8 @@ apply from: "$rootDir/android_build_files/generate_proguard.gradle"
 project.afterEvaluate {
   generateProguardFile('storage')
   setupDexDependencies(':storage:storage_resources')
+  preDebugBuild.dependsOn(':app:externalNativeBuildDebug')
+  preReleaseBuild.dependsOn(':app:externalNativeBuildRelease')
+  preDebugBuild.dependsOn(':auth:externalNativeBuildDebug')
+  preReleaseBuild.dependsOn(':auth:externalNativeBuildRelease')
 }