test

Author: Cynthia Jiang

analytics/CMakeLists.txt

@@ -56,7 +56,6 @@ build_firebase_shared(
   FirebaseCppAnalytics
 )
 
-unity_pack_native(firebase_analytics_swig)
 unity_pack_cs(firebase_analytics_cs)
 
 if (FIREBASE_INCLUDE_UNITY)

app/CMakeLists.txt

@@ -99,7 +99,6 @@ mono_add_library(firebase_app_cs
     ${firebase_native_library}
 )
 
-unity_pack_native(firebase_app_swig)
 unity_pack_cs(firebase_app_cs)
 
 if (FIREBASE_INCLUDE_UNITY)

auth/CMakeLists.txt

@@ -19,6 +19,7 @@ include(build_shared)
 # Firebase Auth Swig input files
 set(firebase_auth_swig
   src/swig/auth.i
+  ${FIREBASE_SOURCE_DIR}/empty.cc
 )
 
 # Firebase Auth CSharp files
@@ -70,7 +71,6 @@ build_firebase_shared(
   FirebaseCppAuth
 )
 
-unity_pack_native(firebase_auth_swig)
 unity_pack_cs(firebase_auth_cs)
 
 if (FIREBASE_INCLUDE_UNITY)

cmake/build_shared.cmake

@@ -25,14 +25,16 @@ include(build_firebase_aar)
 #  OUTPUT_NAME: The output name to use for the shared library
 function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
 
-  set(shared_target "firebase_${LIBRARY_NAME}_shared")
-  add_library(${shared_target} SHARED
-    ${FIREBASE_SOURCE_DIR}/empty.cc
-  )
-  target_link_libraries(${shared_target}
-    "firebase_${LIBRARY_NAME}_swig"
-  )
+  set(shared_target "firebase_${LIBRARY_NAME}_swig")
+  
+  # add_library(${shared_target} SHARED
+  #   ${FIREBASE_SOURCE_DIR}/empty.cc
+  # )
+  
+  set(SHARED_TARGET_LINK_LIB_NAMES "firebase_${LIBRARY_NAME}" "firebase_${LIBRARY_NAME}_swig")
+  message("SHARED_TARGET_LINK_LIB_NAMES is ${SHARED_TARGET_LINK_LIB_NAMES}")
 
+  # Update output name
   set_target_properties(${shared_target} 
     PROPERTIES
       OUTPUT_NAME "${OUTPUT_NAME}"
@@ -52,12 +54,28 @@ function(build_firebase_shared LIBRARY_NAME ARTIFACT_NAME OUTPUT_NAME)
         PREFIX "lib"
         SUFFIX ".a"
     )
+  elseif(ANDROID)
+    set_target_properties(${shared_target}
+      PROPERTIES
+        PREFIX "lib"
+    )
   else()
     set_target_properties(${shared_target}
       PROPERTIES
         PREFIX ""
     )
   endif()
+
+  if(ANDROID)
+    target_link_options(${shared_target}
+      PRIVATE
+        "-llog"
+        "-Wl,-z,defs"
+        "-Wl,--no-undefined"
+        # Link against the static libc++, which is the default done by Gradle.
+        "-static-libstdc++"
+    )
+  endif()
 
   unity_pack_native(${shared_target})
 

cmake/unity_pack.cmake

@@ -224,16 +224,18 @@ endfunction()
 #  * Libraries are put into build arch folder
 #
 function(unity_pack_native name)
-
   if(NOT FIREBASE_PACK_NATIVE)
     return()
   endif()
 
+  message("unity_pack_native pack ${name}")
+
   get_target_property(target_type ${name} TYPE)
 
-  if(NOT "${target_type}" STREQUAL "SHARED_LIBRARY")
-    return()
-  endif()
+  # if(NOT "${target_type}" STREQUAL "SHARED_LIBRARY")
+  #   message("unity_pack_native ${target_type} not equal SHARED_LIBRARY, returned")
+  #   return()
+  # endif()
 
   set(dll_dest "${UNITY_PACK_NATIVE_DIR}/")
 
@@ -256,7 +258,7 @@ function(unity_pack_native name)
       DESTINATION "${dll_dest}"
       COMPONENT "runtime"
     ARCHIVE
-      DESTINATION "${lib_dest}"
+      DESTINATION "${dll_dest}"
       COMPONENT "runtime"
   )
 

crashlytics/CMakeLists.txt

@@ -89,7 +89,6 @@ mono_add_library(firebase_crashlytics_cs
     FIREBASE_OPENSOURCE
 )
 
-unity_pack_native(firebase_crashlytics_swig)
 unity_pack_cs(firebase_crashlytics_cs)
 
 if (FIREBASE_INCLUDE_UNITY)

database/CMakeLists.txt

@@ -74,7 +74,6 @@ build_firebase_shared(
   FirebaseCppDatabase
 )
 
-unity_pack_native(firebase_database_swig)
 unity_pack_cs(firebase_database_cs)
 
 if (FIREBASE_INCLUDE_UNITY)

dynamic_links/CMakeLists.txt

@@ -68,7 +68,6 @@ build_firebase_shared(
   FirebaseCppDynamicLinks
 )
 
-unity_pack_native(firebase_dynamic_links_swig)
 unity_pack_cs(firebase_dynamic_links_cs)
 
 if (FIREBASE_INCLUDE_UNITY)

firestore/CMakeLists.txt

@@ -148,7 +148,6 @@ build_firebase_shared(
   FirebaseCppFirestore
 )
 
-unity_pack_native(firebase_firestore_swig)
 unity_pack_cs(firebase_firestore_cs)
 
 if (FIREBASE_INCLUDE_UNITY)

functions/CMakeLists.txt

@@ -60,7 +60,6 @@ build_firebase_shared(
   FirebaseCppFunctions
 )
 
-unity_pack_native(firebase_functions_swig)
 unity_pack_cs(firebase_functions_cs)
 
 if (FIREBASE_INCLUDE_UNITY)