From 16b56df45dc6bb090e296513e25907a7b9a6e165 Mon Sep 17 00:00:00 2001
From: "aydin.kim" <aydin.kim@samsung.com>
Date: Wed, 21 Aug 2013 15:48:04 +0900
Subject: [PATCH] Servo-Android App packaging works

---
 .gitmodules                             |  3 +++
 Makefile.in                             | 10 ++++++++++
 src/platform/android/servo-android-glue |  1 +
 3 files changed, 14 insertions(+)
 create mode 160000 src/platform/android/servo-android-glue

diff --git a/.gitmodules b/.gitmodules
index 41d83443470d..d5856d448de5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -113,3 +113,6 @@
 [submodule "src/support/egl/rust-egl"]
 	path = src/support/egl/rust-egl
 	url = http://github.com/webconvforge/rust-egl.git
+[submodule "src/platform/android/servo-android-glue"]
+	path = src/platform/android/servo-android-glue
+	url = http://github.com/webconvforge/servo-android-glue.git
diff --git a/Makefile.in b/Makefile.in
index 0bf9b7e77072..19a192f8d259 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -343,6 +343,16 @@ package: servo
 	cp $(B)src/platform/macos/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/platform/macos/rust-cocoa/
 	cp $(B)src/support/azure/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/support/azure/rust-azure/
 
+else ifeq ($(CFG_OSTYPE),linux-androideabi)
+package: servo
+	mkdir -p sofile
+	-exec cp -f {} $(CFG_BUILD_HOME)sofile \;
+	find . ! \( \( -type d -path './sofile' -o -path './$(CFG_TARGET_TRIPLES)/src/compiler/rust' \) -prune \) -name '*.so' -type f | xargs cp -f -t $(CFG_BUILD_HOME)sofile
+	find $(CFG_RUST_HOME)/lib/rustc/$(CFG_TARGET_TRIPLES)/lib/ -name '*.so' -type f -size +1c | xargs cp -f -t $(CFG_BUILD_HOME)sofile
+	cd $(S)src/platform/android/servo-android-glue && make with-libs
+	cd $(CFG_BUILD_HOME)
+	cp $(S)src/platform/android/servo-android-glue/bin/ServoAndroid-debug.apk -t $(CFG_BUILD_HOME)
+
 else
 
 bindings: $(AUTOGEN_SRC_script)
diff --git a/src/platform/android/servo-android-glue b/src/platform/android/servo-android-glue
new file mode 160000
index 000000000000..caf03d371cb9
--- /dev/null
+++ b/src/platform/android/servo-android-glue
@@ -0,0 +1 @@
+Subproject commit caf03d371cb99c9c72a7127114d8f5365a02eb06