Skip to content

Commit

Permalink
#394 Build for 64bit Android
Browse files Browse the repository at this point in the history
made sure all traces of mips commented out
  • Loading branch information
AndyDentFree committed Feb 15, 2016
1 parent 4ad72e4 commit efda106
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions NuGet/NuGet.Library/Realm.targets
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
<AndroidNativeLibrary Include="../packages/Realm.0.72.1/lib/MonoAndroid44/x86/libwrappers.so">
<Link>../packages/Realm.0.72.1/lib/MonoAndroid44/x86/libwrappers.so</Link>
</AndroidNativeLibrary>
<!-- disabled until clarify need and Xamarin support
<AndroidNativeLibrary Include="../packages/Realm.0.72.1/lib/MonoAndroid44/mips/libwrappers.so">
<Link>../packages/Realm.0.72.1/lib/MonoAndroid44/mips/libwrappers.so</Link>
</AndroidNativeLibrary>
-->
<!-- 64bit -->
<AndroidNativeLibrary Include="../packages/Realm.0.72.1/lib/MonoAndroid44/arm64-v8a/libwrappers.so">
<Link>../packages/Realm.0.72.1/lib/MonoAndroid44/arm64-v8a/libwrappers.so</Link>
Expand Down
6 changes: 3 additions & 3 deletions internals/Realm-dotnet Code Change Diary - Andy Dent.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1586,21 +1586,21 @@ RealmWeaverFody.nuspec


-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
#394 BUILD FOR ARM64, x86_64 and MIPS with some Android cleanup
#394 BUILD FOR ARM64, x86_64 with some Android cleanup

wrappers/Makefile
- incremented NDK command min API from 9 to 10 to match Xamarin

Realm.targets
- set version number in paths as 0.72.1
- added arm64-v8a, x86_64 and mips lib build instructions and dependencies
- added arm64-v8a and x86_64 lib build instructions and dependencies

Realm.nuspec
- added arm64-v8a and x86_64 <file> elements
(skipping mips for now until clarify if shipping)

wrappers/jni/Application.mk
- added x86_64 arm64-v8a mips to APP_ABI
- added x86_64 arm64-v8a to APP_ABI
(so they are built into the libs dir)

IntegrationTests.XamarinAndroid
Expand Down
2 changes: 1 addition & 1 deletion wrappers/jni/Application.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#NDK_TOOLCHAIN_VERSION := clang
NDK_TOOLCHAIN_VERSION := 4.9
APP_ABI := armeabi armeabi-v7a x86 x86_64 arm64-v8a mips
APP_ABI := armeabi armeabi-v7a x86 x86_64 arm64-v8a

# Enable C++14
APP_CPPFLAGS += -std=c++14
Expand Down

0 comments on commit efda106

Please sign in to comment.