Don't include analytics_windows.h except on Windows.

If no hash is passed in, load the DLL indiscriminantly.

Author: jonsimantov

analytics/src/analytics_desktop.cc

@@ -19,7 +19,6 @@
 
 #include "analytics/src/analytics_common.h"
 #include "analytics/src/analytics_desktop_dynamic.h"
-#include "analytics/src/analytics_windows.h"  // Added for VerifyAndLoadAnalyticsLibrary
 #include "analytics/src/include/firebase/analytics.h"
 #include "app/src/future_manager.h"  // For FutureData
 #include "app/src/include/firebase/app.h"
@@ -29,6 +28,8 @@
 
 #if defined(_WIN32)
 #include <windows.h>
+
+#include "analytics/src/analytics_windows.h"
 #endif  // defined(_WIN32)
 
 namespace firebase {

analytics/src/analytics_windows.cc

@@ -105,11 +105,15 @@ HMODULE VerifyAndLoadAnalyticsLibrary(
     const wchar_t* library_filename,  // This is expected to be just the DLL
                                       // filename e.g. "analytics_win.dll"
     const unsigned char* expected_hash, size_t expected_hash_size) {
-  if (library_filename == nullptr || library_filename[0] == L'\0' ||
-      expected_hash == nullptr || expected_hash_size == 0) {
+  if (library_filename == nullptr || library_filename[0] == L'\0') {
     LogError("VerifyAndLoadAnalyticsLibrary: Invalid arguments.");
     return nullptr;
   }
+  if (expected_hash == nullptr || expected_hash_size == 0) {
+    // Don't check the hash, just load the library.
+    return LoadLibraryExW(library_filename, NULL,
+                          LOAD_LIBRARY_SEARCH_APPLICATION_DIR);
+  }
 
   // Get full path to the executable using _wpgmptr.
   // This global variable is provided by the CRT and is expected to be available