Merge branch 'ad/bug/android/debug-libs-private#49'

* ad/bug/android/debug-libs-private#49: Private #49 Fix Android Debug Libs + #46 Cleanup Android targets Private #49 Fix Android Debug Libs + #46 Cleanup Android targets # Conflicts: # internals/Realm-dotnet Code Change Diary - Andy Dent.txt
realm · Apr 1, 2016 · 33ae147 · 33ae147
2 parents a1089c6 + 3f5c909
commit 33ae147
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 14 deletions.
diff --git a/NuGet/NuGet.Library/Realm.targets b/NuGet/NuGet.Library/Realm.targets
@@ -1,20 +1,12 @@
 <?xml version="1.0"  encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <ItemGroup>
-        <AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/armeabi/libwrappers.so">
-            <Link>$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/armeabi/libwrappers.so</Link>
-        </AndroidNativeLibrary>
         <AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/armeabi-v7a/libwrappers.so">
             <Link>$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/armeabi-v7a/libwrappers.so</Link>
         </AndroidNativeLibrary>
         <AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/x86/libwrappers.so">
             <Link>$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/x86/libwrappers.so</Link>
         </AndroidNativeLibrary>
-<!-- disabled until clarify need and Xamarin support
-        <AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/mips/libwrappers.so">
-            <Link>$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/mips/libwrappers.so</Link>
-        </AndroidNativeLibrary>
--->        
 <!-- 64bit -->
         <AndroidNativeLibrary Include="$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/arm64-v8a/libwrappers.so">
             <Link>$(SolutionDir)packages/Realm.0.73.1/lib/MonoAndroid44/arm64-v8a/libwrappers.so</Link>

diff --git a/Tests/IntegrationTests.Shared/PeopleTestsBase.cs b/Tests/IntegrationTests.Shared/PeopleTestsBase.cs
@@ -37,7 +37,7 @@ protected void MakeThreePeople()
             using (var transaction = _realm.BeginWrite())
             {
                 p1 = _realm.CreateObject<Person>();
-                p1.FirstName = "John"; // uses our setter which splits and maps to First/Lastname
+                p1.FirstName = "John";
                 p1.LastName = "Smith";
                 p1.IsInteresting = true;
                 p1.Email = "john@smith.com";
@@ -52,7 +52,7 @@ protected void MakeThreePeople()
             using (var transaction = _realm.BeginWrite())
             {
                 p2 = _realm.CreateObject<Person>();
-                p2.FullName = "John Doe"; 
+                p2.FullName = "John Doe"; // uses our setter whcih splits and maps to First/Lastname
                 p2.IsInteresting = false;
                 p2.Email = "john@doe.com";
                 p2.Score = 100;

diff --git a/Tests/IntegrationTests.XamarinAndroid/IntegrationTests.XamarinAndroid.csproj b/Tests/IntegrationTests.XamarinAndroid/IntegrationTests.XamarinAndroid.csproj
@@ -70,21 +70,33 @@
   <Import Project="..\IntegrationTests.Shared\IntegrationTests.Shared.projitems" Label="Shared" Condition="Exists('..\IntegrationTests.Shared\IntegrationTests.Shared.projitems')" />
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <Import Project="..\..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.3\build\portable-net+sl+win+wpa+wp\Fody.targets')" />
-  <!--ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
+  <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
     <AndroidNativeLibrary Include="..\..\wrappers\build\Debug-android\armeabi-v7a\libwrappers.so">
       <Link>wrappers\armeabi-v7\libwrappers.so</Link>
     </AndroidNativeLibrary>
     <AndroidNativeLibrary Include="..\..\wrappers\build\Debug-android\x86\libwrappers.so">
       <Link>wrappers\x86\libwrappers.so</Link>
     </AndroidNativeLibrary>
-  </ItemGroup-->
-  <ItemGroup>
+    <AndroidNativeLibrary Include="..\..\wrappers\build\Debug-android\arm64-v8a\libwrappers.so">
+      <Link>wrappers\armeabi-v7\libwrappers.so</Link>
+    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="..\..\wrappers\build\Debug-android\x86_64\libwrappers.so">
+      <Link>wrappers\armeabi-v7\libwrappers.so</Link>
+    </AndroidNativeLibrary>
+  </ItemGroup>
+  <ItemGroup Condition=" '$(Configuration)' == 'Release' ">
     <AndroidNativeLibrary Include="..\..\wrappers\build\Release-android\armeabi-v7a\libwrappers.so">
       <Link>wrappers\armeabi-v7\libwrappers.so</Link>
     </AndroidNativeLibrary>
     <AndroidNativeLibrary Include="..\..\wrappers\build\Release-android\x86\libwrappers.so">
       <Link>wrappers\x86\libwrappers.so</Link>
     </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="..\..\wrappers\build\Release-android\arm64-v8a\libwrappers.so">
+      <Link>wrappers\armeabi-v7\libwrappers.so</Link>
+    </AndroidNativeLibrary>
+    <AndroidNativeLibrary Include="..\..\wrappers\build\Release-android\x86_64\libwrappers.so">
+      <Link>wrappers\x86\libwrappers.so</Link>
+    </AndroidNativeLibrary>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Realm.XamarinAndroid\Realm.XamarinAndroid.csproj">

diff --git a/internals/Realm-dotnet Code Change Diary - Andy Dent.txt b/internals/Realm-dotnet Code Change Diary - Andy Dent.txt
@@ -1924,6 +1924,21 @@ InstanceTests.cs
 
 
 
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#444 Fix Analytics to match Cocoa
+
+RealmWeaver/Analytics.cs
+- TargetOS changed case and content to match 
+- Analytics.JsonTemplate
+  - Binding changed to "dotnet"
+  - "Langauge" : "c#" added
+- ComputeHostOSNameAndVersion 
+  - report standard lowercase ids
+  - report windows instead of Generic .net
+- TargetOS      
+  - report standard lowercase ids
+
+
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 #353 Specifying Sort
 
@@ -1932,7 +1947,6 @@ SortingTests.cs
 
 SortOrderHandle.cs
 - added
-
 
 RealmResults.cs
 - RealmResults changed from IQueryable<T> to IOrderedQueryable<T>
@@ -1971,3 +1985,17 @@ SortingTests.cs
 
 RealmResultsVisitor.cs
 - VisitMethodCall - add logic to get First from Results if sorted
+
+-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+Private #49 Fix Android Debug Libs + #46 Cleanup Android targets
+
+IntegrationTests.XamarinAndroid.csproj
+- uncomment the Debug conditional section
+- put the Release condition back on the Release ItemGroup
+- Add the 64bit libs back into BOTH groups.
+
+NuGet/NuGet.Library/Realm.targets
+- removed armeabi entry for libwrappers.so
+
+wrappers/jni/Application.mk
+- conditionally add REALM_DEBUG to APP_CPPFLAGS
diff --git a/wrappers/jni/Application.mk b/wrappers/jni/Application.mk
@@ -8,6 +8,9 @@ APP_CPPFLAGS += -frtti
 APP_CPPFLAGS += -fexceptions
 APP_CPPFLAGS += -pthread
 APP_CPPFLAGS += -DREALM_HAVE_CONFIG=1
+ifdef NDK_DEBUG
+APP_CPPFLAGS += -DREALM_DEBUG=1
+endif
 
 # Instruct to use the static GNU STL implementation
 APP_STL := gnustl_static