support android build

mk/check.mk

@@ -6,6 +6,7 @@ check-$(1) : $$(DONE_$(1))
 
 	$$(Q) \
 	$$(ENV_CFLAGS_$(1)) \
+	$$(ENV_CXXFLAGS_$(1)) \
 	$$(ENV_RFLAGS_$(1)) \
 	$$(MAKE) -C $$(B)src/$$(PATH_$(1)) check
 

mk/clean.mk

@@ -47,4 +47,4 @@ clean-script:
 
 clean-servo: clean-gfx clean-util clean-net clean-script clean-msg
 	@$(call E, "cleaning servo")
-	$(Q)rm -f servo servo-test
+	$(Q)rm -f servo servo-test libservo*.so

mk/sub.mk

@@ -157,3 +157,51 @@ DEPS_rust-layers += \
 	$(NULL)
 endif
 
+ifeq ($(CFG_OSTYPE),linux-androideabi)
+DEPS_rust-azure += \
+	rust-freetype \
+	rust-fontconfig \
+	fontconfig \
+	libfreetype2 \
+	libexpat \
+	$(NULL)
+
+# See note at top of file
+DEPS_rust-layers += \
+	rust-freetype \
+	rust-fontconfig \
+	$(NULL)
+
+DEPS_rust-fontconfig += \
+	fontconfig \
+	rust-freetype \
+	$(NULL)
+
+DEPS_rust-freetype += \
+	libfreetype2 \
+	$(NULL)
+
+DEPS_fontconfig += \
+	libexpat \
+	libfreetype2 \
+	$(NULL)
+
+CFLAGS_fontconfig += \
+	"-I$(S)src/platform/android/libexpat/expat/lib" \
+	"-I$(S)src/platform/android/libfreetype2/include" \
+    $(NULL)
+endif
+
+DEPS_skia += \
+	libfreetype2 \
+	$(NULL)
+
+CXXFLAGS_skia += \
+	-I$(S)src/platform/android/libfreetype2/include \
+	$(NULL)
+
+NATIVE_BUILD += \
+	libfreetype2 \
+	libexpat \
+	fontconfig \
+	$(NULL)