Skip to content

Commit 3cc127e

Browse files
committed
Revert "fix: add in test for the DLL"
This reverts commit ea27540.
1 parent 904187b commit 3cc127e

File tree

6 files changed

+1
-48
lines changed

6 files changed

+1
-48
lines changed

analytics/integration_test/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ set(FIREBASE_INTEGRATION_TEST_SRCS
8383

8484
# The include directory for the testapp.
8585
include_directories(src)
86-
include_directories(${FIREBASE_CPP_SDK_DIR})
8786

8887
# Firebase C++ SDK requires C++14.
8988
set (CMAKE_CXX_STANDARD 14)

analytics/integration_test/src/integration_test.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,4 @@ TEST_F(FirebaseAnalyticsTest, TestSetConsent) {
354354
did_test_setconsent_ = true;
355355
}
356356

357-
TEST_F(FirebaseAnalyticsTest, TestIsAnalyticsDllLoaded) {
358-
#if defined(_WIN32)
359-
EXPECT_TRUE(firebase::analytics::internal::IsAnalyticsDllLoaded());
360-
#else
361-
GTEST_SKIP();
362-
#endif // defined(_WIN32)
363-
}
364-
365357
} // namespace firebase_testapp_automated

analytics/src/analytics_android.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <vector>
2323

2424
#include "analytics/src/analytics_common.h"
25-
#include "analytics/src/analytics_internal.h"
2625
#include "analytics/src/include/firebase/analytics.h"
2726
#include "app/src/assert.h"
2827
#include "app/src/include/firebase/app.h"
@@ -166,8 +165,6 @@ namespace internal {
166165
// Determine whether the analytics module is initialized.
167166
bool IsInitialized() { return g_app != nullptr; }
168167

169-
bool IsAnalyticsDllLoaded() { return false; }
170-
171168
} // namespace internal
172169

173170
// Clean up the API.

analytics/src/analytics_internal.h

Lines changed: 0 additions & 32 deletions
This file was deleted.

analytics/src/analytics_ios.mm

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include "analytics/src/include/firebase/analytics.h"
2424

2525
#include "analytics/src/analytics_common.h"
26-
#include "analytics/src/analytics_internal.h"
2726
#include "app/src/assert.h"
2827
#include "app/src/include/firebase/internal/mutex.h"
2928
#include "app/src/include/firebase/version.h"
@@ -134,8 +133,6 @@ void Initialize(const ::firebase::App& app) {
134133
// Determine whether the analytics module is initialized.
135134
bool IsInitialized() { return g_initialized; }
136135

137-
bool IsAnalyticsDllLoaded() { return false; }
138-
139136
} // namespace internal
140137

141138
// Terminate the API.

scripts/gha/build_testapps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ def _build_apple(
627627
"--XCodeCPP.frameworks", ",".join(framework_paths)
628628
]
629629
# Internal integration tests require the SDK root as an include path.
630-
if repo_dir:
630+
if repo_dir and api_config.internal_testapp_path:
631631
xcode_patcher_args.extend(("--XCodeCPP.include", repo_dir))
632632
if os.path.isfile(entitlements_path): # Not all testapps require entitlements
633633
logging.info("Entitlements file detected.")

0 commit comments

Comments
 (0)