Skip to content

Commit fff59bc

Browse files
authored
Merge pull request #4 from firebase/feature_android_build
Make Unity android working
2 parents a790188 + 692a6bb commit fff59bc

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if (FIREBASE_INCLUDE_MONO AND FIREBASE_INCLUDE_UNITY)
7171
endif()
7272

7373
# Darwin library for security
74-
if(APPLE AND NOT FIREBASE_IOS_BUILD)
74+
if(APPLE AND NOT FIREBASE_IOS_BUILD AND NOT FIREBASE_ANDROID_BUILD)
7575
set(FIREBASE_SYSTEM_DEPS
7676
"-framework Foundation"
7777
"-framework Security"

build_android.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS} -DUNITY_ROOT_DIR=${UNITY_ROOT_DIR}"
5757
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DANDROID_NDK=$ANDROID_NDK"
5858
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_TOOLCHAIN_FILE=${list[0]}"
5959
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DANDROID_ABI=armeabi-v7a"
60+
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DFIREBASE_ANDROID_BUILD=true"
61+
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE=release"
6062

6163
# Display commands being run.
6264
set -x
@@ -71,7 +73,7 @@ cmake .. ${CMAKE_OPTIONS} -DANDROID_ABI=armeabi-v7a
7173
check_exit_code $?
7274

7375
# Build the SDK
74-
make -j 8
76+
make # -j 8
7577
check_exit_code $?
7678

7779
# Package build output into zip

crashlytics/src/cpp/android/crashlytics_android.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#include "crashlytics/src/cpp/android/crashlytics_android.h"
1616

17+
#include <assert.h>
1718
#include <jni.h>
1819

1920
#include "app/src/include/firebase/app.h"

0 commit comments

Comments
 (0)