[android-toolchain] Use Android NDK r14b. (#626)

A "funny" thing happened when [attempting to build][0] 84d4230:
building the `armeabi` binaries resulted in a Segmentation fault
*within the compiler*:

	../../doltlibtool  --tag=CC ...
	clang38: error: unable to execute command: Segmentation fault: 11
	clang38: error: clang frontend command failed due to signal (use -v to see invocation)
	...

Building mono for armeabi is *crashing the compiler*.

(This *might* have been introduced in 27a20f0; it's hard to say as I
aborted the 27a20f0 build in order to get the 84d4230 build done
sooner...)

Fix the compiler crash by upgrading the Android NDK toolchain from
r11c to r14b.

[0]: https://jenkins.mono-project.com/view/Xamarin.Android/job/xamarin-android/419/consoleText

Author: jonpryor

build-tools/android-toolchain/android-toolchain.projitems

@@ -5,7 +5,7 @@
     <AntUri Condition=" '$(AntUri)' == '' ">http://archive.apache.org/dist/ant/binaries</AntUri>
   </PropertyGroup>
   <ItemGroup>
-    <AndroidNdkItem Include="android-ndk-r11c-linux-x86_64.zip">
+    <AndroidNdkItem Include="android-ndk-r14b-linux-x86_64.zip">
       <HostOS>Linux</HostOS>
     </AndroidNdkItem>
     <!--
@@ -27,7 +27,7 @@
       <HostOS>Linux</HostOS>
       <DestDir>emulator</DestDir>
     </AndroidSdkItem>
-    <AndroidNdkItem Include="android-ndk-r11c-darwin-x86_64.zip">
+    <AndroidNdkItem Include="android-ndk-r14b-darwin-x86_64.zip">
       <HostOS>Darwin</HostOS>
     </AndroidNdkItem>
     <AndroidSdkItem Include="build-tools_r$(XABuildToolsVersion)-macosx.zip">
@@ -114,19 +114,19 @@
   </ItemGroup>
   <ItemGroup>
     <_NdkToolchain Include="arm-linux-androideabi-clang" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains(':armeabi:')) Or $(AndroidSupportedTargetJitAbisForConditionalChecks.Contains(':armeabi-v7a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-armeabi:'))">
-      <Platform>android-4</Platform>
+      <Platform>9</Platform>
       <Arch>arm</Arch>
     </_NdkToolchain>
     <_NdkToolchain Include="aarch64-linux-android-clang" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains(':arm64-v8a:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-arm64:'))">
-      <Platform>android-21</Platform>
+      <Platform>21</Platform>
       <Arch>arm64</Arch>
     </_NdkToolchain>
     <_NdkToolchain Include="x86-clang" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains(':x86:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86:'))">
-      <Platform>android-9</Platform>
+      <Platform>9</Platform>
       <Arch>x86</Arch>
     </_NdkToolchain>
     <_NdkToolchain Include="x86_64-clang" Condition="$(AndroidSupportedTargetJitAbisForConditionalChecks.Contains(':x86_64:')) Or $(AndroidSupportedTargetAotAbisForConditionalChecks.Contains (':win-x86_64:'))">
-      <Platform>android-21</Platform>
+      <Platform>21</Platform>
       <Arch>x86_64</Arch>
     </_NdkToolchain>
   </ItemGroup>

build-tools/android-toolchain/android-toolchain.targets

@@ -95,10 +95,10 @@
       Inputs="$(AndroidToolchainDirectory)\ndk\.stamp-ndk"
       Outputs="@(_NdkToolchain->'$(AndroidToolchainDirectory)\toolchains\%(Identity)\AndroidVersion.txt')">
     <PropertyGroup>
-      <_Script>$(AndroidToolchainDirectory)\ndk\build\tools\make-standalone-toolchain.sh</_Script>
-      <_Install>@(_NdkToolchain->'$(AndroidToolchainDirectory)\toolchains\%(Identity)')</_Install>
+      <_Script>$(AndroidToolchainDirectory)\ndk\build\tools\make_standalone_toolchain.py</_Script>
     </PropertyGroup>
-    <Exec Command="bash &quot;$(_Script)&quot; --platform=%(_NdkToolchain.Platform) &quot;--install-dir=$(_Install)&quot; --arch=%(_NdkToolchain.Arch) --toolchain=%(_NdkToolchain.Identity)" />
+    <RemoveDir Directories="@(_NdkToolchain->'$(AndroidToolchainDirectory)\toolchains\%(Identity)')" />
+    <Exec Command="python &quot;$(_Script)&quot; -v --api %(_NdkToolchain.Platform) --install-dir &quot;$(AndroidToolchainDirectory)\toolchains\%(_NdkToolchain.Identity)&quot; --arch %(_NdkToolchain.Arch)" />
     <Touch
         Files="@(_NdkToolchain->'$(AndroidToolchainDirectory)\toolchains\%(Identity)\AndroidVersion.txt')"
         AlwaysCreate="False"

src/monodroid/jni/Android.mk

@@ -15,7 +15,6 @@ LOCAL_CFLAGS =	$(COMMON_CFLAGS) \
 	-D_REENTRANT -DPLATFORM_ANDROID -DANDROID -DLINUX -Dlinux -D__linux_ \
 	-DHAVE_CONFIG_H -DJI_DLL_EXPORT -DMONO_DLL_EXPORT \
 	-I$(topdir)/libmonodroid/zip -I$(BUILDDIR)/include -I$(BUILDDIR)/include/eglib \
-	-mandroid \
 	-fno-strict-aliasing \
 	-ffunction-sections \
 	-fomit-frame-pointer \

src/sqlite-xamarin/src-jni/Android.mk

@@ -45,13 +45,13 @@ LOCAL_SRC_FILES := $(common_src_files)
 
 LOCAL_CFLAGS += $(device_sqlite_flags)
 
-LOCAL_SHARED_LIBRARIES := libdl
+LOCAL_EXPORT_LDLIBS := -ldl
 
 LOCAL_MODULE:= libsqlite3_xamarin
 
 LOCAL_C_INCLUDES += $(call include-path-for, system-core)/cutils
 
-LOCAL_SHARED_LIBRARIES += liblog
+LOCAL_EXPORT_LDLIBS += -llog
 
 # include android specific methods
 #LOCAL_WHOLE_STATIC_LIBRARIES := libsqlite3_xamarin