From 56d5c6275b67795ee9f22024768271c140745d57 Mon Sep 17 00:00:00 2001 From: Vimanyu Date: Wed, 14 Apr 2021 12:26:00 -0700 Subject: [PATCH 1/3] remove parallel build with make. On my mac, make would pause and resume only after hitting "Enter". We should take a look at this later. --- build_ios.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_ios.sh b/build_ios.sh index 0d8dec28c..a3671d4aa 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -61,7 +61,7 @@ pushd "$DIR" check_exit_code $? # Build the SDK - make -j 8 + make check_exit_code $? # Package build output into zip From eb1a5a1519ffa0060c1c4f35a44bffba633042a8 Mon Sep 17 00:00:00 2001 From: Vimanyu Date: Wed, 14 Apr 2021 12:26:58 -0700 Subject: [PATCH 2/3] remove Fabric and use FirebaseCrashlytics --- crashlytics/src/cpp/CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/crashlytics/src/cpp/CMakeLists.txt b/crashlytics/src/cpp/CMakeLists.txt index 1f63e947b..a69e89469 100644 --- a/crashlytics/src/cpp/CMakeLists.txt +++ b/crashlytics/src/cpp/CMakeLists.txt @@ -18,7 +18,6 @@ set(firebase_crashlytics_cpp_ios ios/CrashlyticsiOSWrapper.m ios/CrashlyticsiOSWrapper.h ios/Crashlytics_PrivateHeaders/Crashlytics_Platform.h - ios/Crashlytics_PrivateHeaders/Fabric_Private.h ) set(firebase_crashlytics_cpp_android @@ -78,8 +77,7 @@ if(IOS) setup_pod_headers( firebase_crashlytics POD_NAMES - Crashlytics - Fabric + FirebaseCrashlytics ) # Crashlytics pods use 'iOS' dir instead of 'Frameworks' dir From d6353237f3572986e66c07adf4ad5449cf33019c Mon Sep 17 00:00:00 2001 From: Vimanyu Date: Fri, 16 Apr 2021 11:23:15 -0700 Subject: [PATCH 3/3] comment with removing parallel make --- build_ios.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build_ios.sh b/build_ios.sh index a3671d4aa..570bf1741 100755 --- a/build_ios.sh +++ b/build_ios.sh @@ -61,6 +61,10 @@ pushd "$DIR" check_exit_code $? # Build the SDK + # using make -j is having some issues where the build hangs + # and continues on pressing return only to stop sometime later. + # Disabling parallel builds for now. + # TODO: Enable parallel builds after finding the reason make check_exit_code $?