Skip to content

Commit 0ac7276

Browse files
AustinBenoitAustinBenoit
committed
Remove the old changes
1 parent a5c789f commit 0ac7276

6 files changed

Lines changed: 41 additions & 39 deletions

File tree

‎analytics/integration_test/integration_test.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
529226F71C85F68000C89379 /* Debug */ = {
376376
isa = XCBuildConfiguration;
377377
buildSettings = {
378-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
378+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
379379
OTHER_LDFLAGS = "$(inherited)";
380380
ALWAYS_SEARCH_USER_PATHS = NO;
381381
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -420,7 +420,7 @@
420420
529226F81C85F68000C89379 /* Release */ = {
421421
isa = XCBuildConfiguration;
422422
buildSettings = {
423-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
423+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
424424
OTHER_LDFLAGS = "$(inherited)";
425425
ALWAYS_SEARCH_USER_PATHS = NO;
426426
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
@@ -459,7 +459,7 @@
459459
529226FA1C85F68000C89379 /* Debug */ = {
460460
isa = XCBuildConfiguration;
461461
buildSettings = {
462-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
462+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
463463
OTHER_LDFLAGS = "$(inherited)";
464464
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
465465
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -493,7 +493,7 @@
493493
529226FB1C85F68000C89379 /* Release */ = {
494494
isa = XCBuildConfiguration;
495495
buildSettings = {
496-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
496+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
497497
OTHER_LDFLAGS = "$(inherited)";
498498
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
499499
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
@@ -526,7 +526,7 @@
526526
BC1D665F2668D10A005DC2DA /* Debug */ = {
527527
isa = XCBuildConfiguration;
528528
buildSettings = {
529-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
529+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
530530
OTHER_LDFLAGS = "$(inherited)";
531531
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
532532
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
@@ -582,7 +582,7 @@
582582
BC1D66602668D10A005DC2DA /* Release */ = {
583583
isa = XCBuildConfiguration;
584584
buildSettings = {
585-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
585+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
586586
OTHER_LDFLAGS = "$(inherited)";
587587
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
588588
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;

‎app/integration_test/integration_test.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@
210210
529226F71C85F68000C89379 /* Debug */ = {
211211
isa = XCBuildConfiguration;
212212
buildSettings = {
213-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
214-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
213+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
214+
OTHER_LDFLAGS = "$(inherited)";
215215
ALWAYS_SEARCH_USER_PATHS = NO;
216216
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
217217
CLANG_CXX_LIBRARY = "libc++";
@@ -255,8 +255,8 @@
255255
529226F81C85F68000C89379 /* Release */ = {
256256
isa = XCBuildConfiguration;
257257
buildSettings = {
258-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
259-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
258+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
259+
OTHER_LDFLAGS = "$(inherited)";
260260
ALWAYS_SEARCH_USER_PATHS = NO;
261261
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
262262
CLANG_CXX_LIBRARY = "libc++";
@@ -294,8 +294,8 @@
294294
529226FA1C85F68000C89379 /* Debug */ = {
295295
isa = XCBuildConfiguration;
296296
buildSettings = {
297-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
298-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
297+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
298+
OTHER_LDFLAGS = "$(inherited)";
299299
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
300300
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
301301
CLANG_ENABLE_MODULES = YES;
@@ -328,8 +328,8 @@
328328
529226FB1C85F68000C89379 /* Release */ = {
329329
isa = XCBuildConfiguration;
330330
buildSettings = {
331-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
332-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
331+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
332+
OTHER_LDFLAGS = "$(inherited)";
333333
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
334334
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
335335
CLANG_ENABLE_MODULES = YES;

‎messaging/integration_test/integration_test.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -399,8 +399,8 @@
399399
529226F71C85F68000C89379 /* Debug */ = {
400400
isa = XCBuildConfiguration;
401401
buildSettings = {
402-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
403-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
402+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
403+
OTHER_LDFLAGS = "$(inherited)";
404404
ALWAYS_SEARCH_USER_PATHS = NO;
405405
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
406406
CLANG_CXX_LIBRARY = "libc++";
@@ -444,8 +444,8 @@
444444
529226F81C85F68000C89379 /* Release */ = {
445445
isa = XCBuildConfiguration;
446446
buildSettings = {
447-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
448-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
447+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
448+
OTHER_LDFLAGS = "$(inherited)";
449449
ALWAYS_SEARCH_USER_PATHS = NO;
450450
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
451451
CLANG_CXX_LIBRARY = "libc++";
@@ -484,8 +484,8 @@
484484
isa = XCBuildConfiguration;
485485
baseConfigurationReference = 187DA1CE07295DEC4378B7E2 /* Pods-integration_test.debug.xcconfig */;
486486
buildSettings = {
487-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
488-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
487+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
488+
OTHER_LDFLAGS = "$(inherited)";
489489
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
490490
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
491491
CLANG_ENABLE_MODULES = YES;
@@ -519,8 +519,8 @@
519519
isa = XCBuildConfiguration;
520520
baseConfigurationReference = 577B09235E486561D55F37DF /* Pods-integration_test.release.xcconfig */;
521521
buildSettings = {
522-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
523-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
522+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
523+
OTHER_LDFLAGS = "$(inherited)";
524524
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
525525
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
526526
CLANG_ENABLE_MODULES = YES;
@@ -553,8 +553,8 @@
553553
isa = XCBuildConfiguration;
554554
baseConfigurationReference = CCCD7F9F30C5B4CDF23E3893 /* Pods-integration_test_tvos.debug.xcconfig */;
555555
buildSettings = {
556-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
557-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
556+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
557+
OTHER_LDFLAGS = "$(inherited)";
558558
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
559559
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
560560
CLANG_ANALYZER_NONNULL = YES;
@@ -610,8 +610,8 @@
610610
isa = XCBuildConfiguration;
611611
baseConfigurationReference = 81EF7FBB876B573921A52197 /* Pods-integration_test_tvos.release.xcconfig */;
612612
buildSettings = {
613-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
614-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
613+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
614+
OTHER_LDFLAGS = "$(inherited)";
615615
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
616616
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
617617
CLANG_ANALYZER_NONNULL = YES;

‎remote_config/integration_test/integration_test.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@
375375
529226F71C85F68000C89379 /* Debug */ = {
376376
isa = XCBuildConfiguration;
377377
buildSettings = {
378-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
379-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
378+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
379+
OTHER_LDFLAGS = "$(inherited)";
380380
ALWAYS_SEARCH_USER_PATHS = NO;
381381
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
382382
CLANG_CXX_LIBRARY = "libc++";
@@ -420,8 +420,8 @@
420420
529226F81C85F68000C89379 /* Release */ = {
421421
isa = XCBuildConfiguration;
422422
buildSettings = {
423-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
424-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
423+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
424+
OTHER_LDFLAGS = "$(inherited)";
425425
ALWAYS_SEARCH_USER_PATHS = NO;
426426
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
427427
CLANG_CXX_LIBRARY = "libc++";
@@ -459,8 +459,8 @@
459459
529226FA1C85F68000C89379 /* Debug */ = {
460460
isa = XCBuildConfiguration;
461461
buildSettings = {
462-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
463-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
462+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
463+
OTHER_LDFLAGS = "$(inherited)";
464464
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
465465
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
466466
CLANG_ENABLE_MODULES = YES;
@@ -493,8 +493,8 @@
493493
529226FB1C85F68000C89379 /* Release */ = {
494494
isa = XCBuildConfiguration;
495495
buildSettings = {
496-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
497-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
496+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
497+
OTHER_LDFLAGS = "$(inherited)";
498498
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
499499
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
500500
CLANG_ENABLE_MODULES = YES;
@@ -526,8 +526,8 @@
526526
BC1D665F2668D10A005DC2DA /* Debug */ = {
527527
isa = XCBuildConfiguration;
528528
buildSettings = {
529-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
530-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
529+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
530+
OTHER_LDFLAGS = "$(inherited)";
531531
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
532532
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
533533
CLANG_ANALYZER_NONNULL = YES;
@@ -582,8 +582,8 @@
582582
BC1D66602668D10A005DC2DA /* Release */ = {
583583
isa = XCBuildConfiguration;
584584
buildSettings = {
585-
OTHER_CPLUSPLUSFLAGS = "$(inherited) -D_LIBCPP_HAS_NO_VERBOSE_ABORT -D_LIBCPP_DISABLE_AVAILABILITY";
586-
OTHER_LDFLAGS = "$(inherited) -Wl,-weak-lswift_Concurrency";
585+
OTHER_CPLUSPLUSFLAGS = "$(inherited)";
586+
OTHER_LDFLAGS = "$(inherited)";
587587
ASSETCATALOG_COMPILER_APPICON_NAME = "App Icon & Top Shelf Image";
588588
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
589589
CLANG_ANALYZER_NONNULL = YES;

‎testing/CMakeLists.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,3 +158,5 @@ target_link_libraries(firebase_testing
158158
gtest
159159
gmock
160160
)
161+
162+
add_dependencies(firebase_testing generate_testing_fps)

‎testing/sample_framework/src/app_framework.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
// crashing when they are missing from the system libraries on older OSs.
3434
namespace std {
3535
inline namespace __1 {
36-
__attribute__((weak)) void __libcpp_verbose_abort(const char* format, ...) {
36+
__attribute__((weak)) void __libcpp_verbose_abort(const char* format, ...) noexcept {
3737
va_list list;
3838
va_start(list, format);
3939
vfprintf(stderr, format, list);

0 commit comments

Comments
 (0)