From a44b39fda6a59eb71011b60b7ed80cc294b1ae82 Mon Sep 17 00:00:00 2001 From: Huang Xin Date: Tue, 28 Nov 2017 02:23:54 +0800 Subject: [PATCH] [build] Darwin build of Android port (#3520) --- Makefile | 4 ++-- README.md | 3 ++- base | 2 +- platform/android/luajit-launcher | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e78ca1029..3764f9e5b 100644 --- a/Makefile +++ b/Makefile @@ -312,9 +312,9 @@ androidupdate: all cp $(INSTALL_DIR)/koreader/git-rev $(INSTALL_DIR)/koreader/ota-rev # don't update the git-rev so that the next start won't revert back # the older 7z version in the assets - sed -i '/git-rev/d' $(INSTALL_DIR)/koreader/ota/package.index + $(ISED) '/git-rev/d' $(INSTALL_DIR)/koreader/ota/package.index # make gzip android update for zsync OTA update - cd $(INSTALL_DIR)/koreader && \ + -cd $(INSTALL_DIR)/koreader && \ tar czafh ../../koreader-android-$(MACHINE)-$(VERSION).targz \ -T ota/package.index --no-recursion # make android update apk diff --git a/README.md b/README.md index e77c2f5cf..45d9830d7 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,8 @@ ld: cannot find -lglib-2.0` Mac OSX users may need to install these tools: ``` -brew install nasm binutils libtool autoconf automake cmake makedepend sdl2 lua51 +brew install nasm binutils libtool autoconf automake cmake makedepend sdl2 lua51 gettext +echo 'export PATH="/usr/local/opt/gettext/bin:$PATH"' >> ~/.bash_profile ``` The KOReader Android build requires `ant`, `openjdk-8-jdk` and `p7zip-full`. A compatible version of the Android NDK and SDK will be downloaded automatically by `./kodev build android` if no NDK or SDK is provided in environment variables. For that purpose you can use `NDK=/ndk/location SDK=/sdk/location ./kodev build android`. diff --git a/base b/base index 9347a6523..38dbc22d2 160000 --- a/base +++ b/base @@ -1 +1 @@ -Subproject commit 9347a6523bce1d233dee84e70bf5282f17af901a +Subproject commit 38dbc22d2032b9db3a4bf84c4e61a27e5991b47a diff --git a/platform/android/luajit-launcher b/platform/android/luajit-launcher index d0cc5f770..80b12a045 160000 --- a/platform/android/luajit-launcher +++ b/platform/android/luajit-launcher @@ -1 +1 @@ -Subproject commit d0cc5f77026b13e5acb3bcf0912fa31295641226 +Subproject commit 80b12a0454ad6ef60dc253380fd0fea6deeec8d2