Skip to content

Commit 0119402

Browse files
committed
Cherry-pick changes from #795: Delete app/src/mutex.h and adjust includes to app/src/include/firebase/internal/mutex.h
This commit will be deleted once this is rebased onto main.
1 parent 89ecf20 commit 0119402

File tree

92 files changed

+90
-113
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+90
-113
lines changed

admob/src/android/banner_view_internal_android.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "admob/src/include/firebase/admob/banner_view.h"
3131
#include "admob/src/include/firebase/admob/types.h"
3232
#include "app/src/assert.h"
33-
#include "app/src/mutex.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3434
#include "app/src/semaphore.h"
3535
#include "app/src/util_android.h"
3636

admob/src/android/native_express_ad_view_internal_android.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
3131
#include "admob/src/include/firebase/admob/types.h"
3232
#include "app/src/assert.h"
33-
#include "app/src/mutex.h"
33+
#include "app/src/include/firebase/internal/mutex.h"
3434
#include "app/src/util_android.h"
3535

3636
namespace firebase {

admob/src/common/banner_view_internal.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/banner_view.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

admob/src/common/banner_view_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/banner_view.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

admob/src/common/interstitial_ad_internal.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/interstitial_ad.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

admob/src/common/interstitial_ad_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/interstitial_ad.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

admob/src/common/native_express_ad_view_internal.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

admob/src/common/native_express_ad_view_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/admob_common.h"
2121
#include "admob/src/include/firebase/admob/native_express_ad_view.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

admob/src/common/rewarded_video.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "admob/src/common/rewarded_video_internal.h"
2121
#include "app/src/assert.h"
2222
#include "app/src/include/firebase/future.h"
23-
#include "app/src/mutex.h"
23+
#include "app/src/include/firebase/internal/mutex.h"
2424

2525
namespace firebase {
2626
namespace admob {

admob/src/common/rewarded_video_internal.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
#include "admob/src/include/firebase/admob/rewarded_video.h"
2020
#include "app/src/include/firebase/future.h"
21+
#include "app/src/include/firebase/internal/mutex.h"
2122
#include "app/src/include/firebase/internal/platform.h"
22-
#include "app/src/mutex.h"
2323
#include "app/src/reference_counted_future_impl.h"
2424

2525
#if FIREBASE_PLATFORM_ANDROID

0 commit comments

Comments
 (0)