Skip to content

Commit 0632d9c

Browse files
committed
Fix up before review
1 parent 7671db2 commit 0632d9c

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.github/workflows/integration_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ jobs:
360360
if: startsWith(matrix.os, 'windows')
361361
shell: bash
362362
run: |
363-
find "testapps-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}" -name integration_test.exe -exec dirname {} \; | while read dir; do cp analytics/windows/analytics_win.dll "$dir/"; done
363+
find "testapps-desktop-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.ssl_variant }}" -name integration_test.exe -exec dirname {} \; | while read dir; do cp analytics/windows/google_analytics.dll "$dir/"; done
364364
- name: Upload Desktop Cmake
365365
uses: actions/upload-artifact@v4
366366
if: ${{ !cancelled() }}

analytics/integration_test/src/integration_test.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ TEST_F(FirebaseAnalyticsTest, TestSetLogCallback) {
256256
finishedPromise.set_value();
257257
});
258258

259-
// Pass kUnknown to trigger a warning log directly from the DLL (on Windows),
260259
firebase::analytics::NotifyAppLifecycleChange(firebase::analytics::kUnknown);
261260

262261
if (finished.wait_for(std::chrono::seconds(60)) ==

analytics/src/analytics_desktop.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ LogLevel ConvertAnalyticsLogLevelToFirebaseLogLevel(
412412
}
413413

414414

415-
extern "C" void GoogleAnalyticsWrapperLogCallback(
415+
void GoogleAnalyticsWrapperLogCallback(
416416
GoogleAnalytics_LogLevel log_level, const char* message) {
417417
LogCallback callback_to_call;
418418

analytics/src/include/firebase/analytics.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,6 +612,7 @@ void ResetAnalyticsData();
612612
/// @brief The callback type for logging messages from the SDK.
613613
///
614614
/// The callback is invoked whenever the SDK logs a message.
615+
/// Currently only works for Windows Desktop.
615616
///
616617
/// @param[in] log_level The log level of the message.
617618
/// @param[in] message The message logged by the SDK.
@@ -639,10 +640,9 @@ enum AppLifecycleState { kUnknown = 0, kTermination };
639640
/// kTermination is used to indicate that the app is about to be terminated.
640641
/// The caller will be blocked until all pending data is uploaded or an error
641642
/// occurs. The caller must ensure the OS does not terminate background threads
642-
/// before the call returns.
643+
/// before the call returns. Currently only works for Windows Desktop.
643644
///
644645
/// @param[in] state The current state of the app's lifecycle.
645-
646646
void NotifyAppLifecycleChange(AppLifecycleState state);
647647

648648
/// Get the instance ID from the analytics service.

0 commit comments

Comments
 (0)