Add x86 and x86-84 to sdks.

sdks/Makefile

@@ -22,14 +22,25 @@ SECURITY_CFLAGS = -Wl,-z,now -Wl,-z,relro -Wl,-z,noexecstack -fstack-protector
 ARM_CFLAGS=$(COMMON_CFLAGS) -D__POSIX_VISIBLE=201002 -DSK_RELEASE -DNDEBUG -UDEBUG -fpic
 ARM_CXXFLAGS=$(ARM_CFLAGS)
 
+ARM64_CFLAGS=$(COMMON_CFLAGS) -D__POSIX_VISIBLE=201002 -DSK_RELEASE -DNDEBUG -UDEBUG -fpic
+ARM64_CXXFLAGS=$(ARM64_CFLAGS)
 
-armv7-android-generated.mk aarch64-android-generated.mk: android-template.rb android.erb
+X86_CFLAGS=$(COMMON_CFLAGS)
+X86_CXXFLAGS=$(X86_CFLAGS)
+
+X86_64_CFLAGS=$(COMMON_CFLAGS)
+X86_64_CXXFLAGS=$(X86_64_CFLAGS)
+
+armv7-android-generated.mk aarch64-android-generated.mk x86-android-generated.mk x86_64-android-generated.mk: android-template.rb android.erb
 	ruby android-template.rb
 
 include armv7-android-generated.mk
 include aarch64-android-generated.mk
+include x86-android-generated.mk
+include x86_64-android-generated.mk
 
-$(MONO_SOURCE_PATH)/configure: $(MONO_SOURCE_PATH)/configure.ac Makefile
+# $(MONO_SOURCE_PATH)/configure: $(MONO_SOURCE_PATH)/configure.ac Makefile
+$(MONO_SOURCE_PATH)/configure: $(MONO_SOURCE_PATH)/configure.ac
 	pushd $(MONO_SOURCE_PATH) &&	\
 	NOCONFIGURE=1 ./autogen.sh && \
 	popd

sdks/android-template.rb

@@ -12,6 +12,7 @@ class AndroidTemplateVar
   attr_accessor :cflags
   attr_accessor :cppflags
   attr_accessor :filename
+  attr_accessor :plat
 
   def initialize()
     @template = File.read("android.erb")
@@ -40,6 +41,7 @@ env.ldflags="-Wl,--fix-cortex-a8"
 env.cflags="-mtune=cortex-a8 -march=armv7-a -mfpu=vfp -mfloat-abi=softfp"
 env.cppflags="-I$(#{env.name}_NDK_PLATFORM)/arch-#{env.toolchain_arch}/usr/include/"
 env.filename="armv7-android-generated.mk"
+env.plat = "ARM"
 env.run
 
 env = AndroidTemplateVar.new
@@ -54,5 +56,36 @@ env.ldflags=""
 env.cflags="-DL_cuserid=9 -DANDROID64"
 env.cppflags=""
 env.filename="aarch64-android-generated.mk"
+env.plat = "ARM64"
+env.run
+
+env = AndroidTemplateVar.new
+env.platform="android-9"
+env.name="android_x86"
+env.dir="x86-android"
+env.abi_name="i686-linux-android"
+env.toolchain_name="x86-clang"
+env.toolchain_arch="x86"
+env.host_triple="i686-linux-android"
+env.ldflags=""
+env.cflags=""
+env.cppflags=""
+env.filename="x86-android-generated.mk"
+env.plat = "X86"
+env.run
+
+env = AndroidTemplateVar.new
+env.platform="android-21"
+env.name="android_x86_64"
+env.dir="x86_64-android"
+env.abi_name="x86_64-linux-android"
+env.toolchain_name="x86_64-clang"
+env.toolchain_arch="x86_64"
+env.host_triple="x86_64-linux-android"
+env.ldflags=""
+env.cflags="-DL_cuserid=9"
+env.cppflags=""
+env.filename="x86_64-android-generated.mk"
+env.plat = "X86_64"
 env.run
 

sdks/android.erb

@@ -25,8 +25,8 @@
 <%=name%>_LDFLAGS=$(COMMON_LDFLAGS) $(<%=name%>_EXTRA_LDFLAGS) \
 			-Wl,-rpath-link=$(<%=name%>_NDK_PLATFORM)/arch-$(<%=name%>_NDK_TOOLCHAIN_ARCH)/usr/lib,-dynamic-linker=/system/bin/linker \
 			-L$(<%=name%>_NDK_PLATFORM)/arch-$(<%=name%>_NDK_TOOLCHAIN_ARCH)/usr/lib
-<%=name%>_CFLAGS=$(ARM_CFLAGS) $(<%=name%>_EXTRA_CFLAGS) $(SECURITY_CFLAGS) -DMONODROID=1
-<%=name%>_CXXFLAGS=$(ARM_CXXFLAGS) $(<%=name%>_EXTRA_CFLAGS) $(SECURITY_CFLAGS) -DMONODROID=1
+<%=name%>_CFLAGS=$(<%=plat%>_CFLAGS) $(<%=name%>_EXTRA_CFLAGS) $(SECURITY_CFLAGS) -DMONODROID=1
+<%=name%>_CXXFLAGS=$(<%=plat%>_CXXFLAGS) $(<%=name%>_EXTRA_CFLAGS) $(SECURITY_CFLAGS) -DMONODROID=1
 <%=name%>_CC=$(<%=name%>_TOOLCHAIN_BIN_DIR)/$(<%=name%>_NAME)-$(CC_NAME)
 <%=name%>_CXX=$(<%=name%>_TOOLCHAIN_BIN_DIR)/$(<%=name%>_NAME)-$(CXX_NAME)
 <%=name%>_CPP=$(<%=name%>_TOOLCHAIN_BIN_DIR)/$(<%=name%>_NAME)-cpp $(<%=name%>_EXTRA_CPPFLAGS)