Skip to content

Commit

Permalink
Servo-Android App packaging works
Browse files Browse the repository at this point in the history
  • Loading branch information
aydin.kim committed Dec 31, 2013
1 parent 3fe1274 commit 16b56df
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -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
10 changes: 10 additions & 0 deletions Makefile.in
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions src/platform/android/servo-android-glue
Submodule servo-android-glue added at caf03d

0 comments on commit 16b56df

Please sign in to comment.