From 514919985e41eafb3e5759b9ac7cc43590490c14 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 1 Jun 2014 22:54:53 +0800 Subject: [PATCH 1/3] update koreader-base --- koreader-base | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koreader-base b/koreader-base index adfd78e69..1b94479ca 160000 --- a/koreader-base +++ b/koreader-base @@ -1 +1 @@ -Subproject commit adfd78e69146657566f18fa8815ff0028b1f4e21 +Subproject commit 1b94479ca1878e78542e9d30e9e7b0d7f2521ae2 From e10a0cecf31afccaf87ad0c71d4887ddd647d57e Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 1 Jun 2014 22:55:39 +0800 Subject: [PATCH 2/3] use koreader/koreader travis icon and link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 27e1d5e28..86cfae8b8 100644 --- a/README.md +++ b/README.md @@ -180,8 +180,8 @@ http://ccache.samba.org [base-readme]:https://github.com/koreader/koreader-base/blob/master/README.md [nb-script]:https://github.com/koreader/koreader-misc/blob/master/koreader-nightlybuild/koreader-nightlybuild.sh -[travis-icon]:https://travis-ci.org/koreader/koreader-base.png?branch=master -[travis-link]:https://travis-ci.org/koreader/koreader-base +[travis-icon]:https://travis-ci.org/koreader/koreader.png?branch=master +[travis-link]:https://travis-ci.org/koreader/koreader [travis-conf]:https://github.com/koreader/koreader-base/blob/master/.travis.yml [linux-vm]:http://www.howtogeek.com/howto/11287/how-to-run-ubuntu-in-windows-7-with-vmware-player/ From bda2a1aab45af33072ee72c31b7e567cc555a045 Mon Sep 17 00:00:00 2001 From: chrox Date: Sun, 1 Jun 2014 23:16:45 +0800 Subject: [PATCH 3/3] need ndk-build command in PATH to build koreader for Android --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 86cfae8b8..c3b8c6295 100644 --- a/README.md +++ b/README.md @@ -94,8 +94,8 @@ package from scratch. For Android devices ------------------- -Make sure the "android" tool is in your PATH variable and the NDK variable -points to the root directory of the Android NDK. +Make sure the "android" and "ndk-build" tools are in your PATH variable +and the NDK variable points to the root directory of the Android NDK. First, run this command to make a standalone android cross compiling toolchain from NDK: