Skip to content

Updated Analytics Windows to allow multiple DLL hashes, and add usage of Options struct. #1744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Jun 25, 2025
Merged
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
81045a0
Update script and code to handle known hashes for multiple DLLs.
jonsimantov Jun 16, 2025
2a2bc2b
Fixed issues on Windows with multi-dll-hash code.
jonsimantov Jun 19, 2025
9171093
Fix: Link Crypt32.lib for firebase_analytics on Windows
google-labs-jules[bot] Jun 23, 2025
e75fb8c
Fix: Link Crypt32.lib for firebase_analytics_test on Windows
google-labs-jules[bot] Jun 24, 2025
d806c1f
Update DLL.
jonsimantov Jun 25, 2025
0911aec
Merge branch 'analytics-dll-secure-multihash' into fix/analytics-dll-…
jonsimantov Jun 25, 2025
867937e
Merge branch 'fix/analytics-dll-hash-sizeof' of https://github.com/fi…
jonsimantov Jun 25, 2025
60199f3
Remove unused file.
jonsimantov Jun 25, 2025
7936e99
Remove extra file.
jonsimantov Jun 25, 2025
fc5aa8e
Initialize Analytics C SDK with AppOptions on desktop
google-labs-jules[bot] Jun 25, 2025
cfa4385
Update stub generation.
jonsimantov Jun 25, 2025
ab86de9
Merge branch 'analytics_windows_dll_updated' into feat/desktop-analyt…
jonsimantov Jun 25, 2025
e3e8a08
Format code.
jonsimantov Jun 25, 2025
9a65e98
Fix build issues.
jonsimantov Jun 25, 2025
fcd9aaa
Update Analytics to use new options struct. (#1745)
jonsimantov Jun 25, 2025
421ce66
Format code.
jonsimantov Jun 25, 2025
764619b
Only display Analytics warnings if we are not in stub mode.
jonsimantov Jun 25, 2025
72affd7
Merge branch 'feat/desktop-analytics-init-options' into analytics_win…
jonsimantov Jun 25, 2025
1e23573
Format code.
jonsimantov Jun 25, 2025
377a83c
Address review comments and add missing copyright notices.
jonsimantov Jun 25, 2025
44816bb
Remove extraneous commented out code.
jonsimantov Jun 25, 2025
f5fb8d2
Add another known hash to the list.
jonsimantov Jun 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove extraneous commented out code.
  • Loading branch information
jonsimantov committed Jun 25, 2025
commit 44816bbe4a5d7934740aaf291b54d84af1dfb026
7 changes: 0 additions & 7 deletions analytics/generate_windows_stubs.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,6 @@ def generate_function_pointers(dll_file_path, header_file_path, output_h_path, o
f.write("// clang-format off\n")
f.write(f'\n// Number of Google Analytics functions expected to be loaded from the DLL.')
f.write(f'\nconst int FirebaseAnalytics_DynamicFunctionCount = {len(function_details_for_loader)};\n\n');
# f.write("#if defined(_WIN32)\n")
# f.write('// Google Analytics Windows DLL SHA256 hash, to be verified before loading.\n')
# f.write('const unsigned char FirebaseAnalytics_WindowsDllHash[] = {\n ')
# f.write(', '.join(["0x%02x" % s for s in dll_hash]))
# f.write('\n};\n')
# f.write("#endif // defined(_WIN32)\n")

f.write("#if defined(_WIN32)\n")
f.write('// Array of known Google Analytics Windows DLL SHA256 hashes (hex strings).\n')
f.write('const char* FirebaseAnalytics_KnownWindowsDllHashes[] = {\n')
Expand Down
Loading