Skip to content

Make Unity android working #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ if (FIREBASE_INCLUDE_MONO AND FIREBASE_INCLUDE_UNITY)
endif()

# Darwin library for security
if(APPLE AND NOT FIREBASE_IOS_BUILD)
if(APPLE AND NOT FIREBASE_IOS_BUILD AND NOT FIREBASE_ANDROID_BUILD)
set(FIREBASE_SYSTEM_DEPS
"-framework Foundation"
"-framework Security"
Expand Down
4 changes: 3 additions & 1 deletion build_android.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ CMAKE_OPTIONS="${CMAKE_OPTIONS}-DUNITY_ENGINE_DLL_DIR=${UNITY_ENGINE_DLL_DIR}"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DANDROID_NDK=$ANDROID_NDK"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_TOOLCHAIN_FILE=${list[0]}"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DANDROID_ABI=armeabi-v7a"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DFIREBASE_ANDROID_BUILD=true"
CMAKE_OPTIONS="${CMAKE_OPTIONS} -DCMAKE_BUILD_TYPE=release"

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

# Build the SDK
make -j 8
make # -j 8
check_exit_code $?

# Package build output into zip
Expand Down
1 change: 1 addition & 0 deletions crashlytics/src/cpp/android/crashlytics_android.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@

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

#include <assert.h>
#include <jni.h>

#include "app/src/include/firebase/app.h"
Expand Down