From b1d8db554e09b6564afbb8814610a23fe54e9f65 Mon Sep 17 00:00:00 2001 From: sonic Date: Wed, 24 Aug 2011 13:50:43 +0000 Subject: [PATCH] Added some rules and files for automatic bootstrap build git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@40853 fb15a70f-31f2-0310-bbcc-cdcc74a49acc --- arch/all-android/bootstrap/app/build.properties | 4 ++++ arch/all-android/bootstrap/mmakefile.src | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) create mode 100644 arch/all-android/bootstrap/app/build.properties diff --git a/arch/all-android/bootstrap/app/build.properties b/arch/all-android/bootstrap/app/build.properties new file mode 100644 index 0000000000..0e4d192599 --- /dev/null +++ b/arch/all-android/bootstrap/app/build.properties @@ -0,0 +1,4 @@ +key.store=${user.home}/.android/AROS.keystore +key.alias=AROS +key.store.password = aros.org +key.alias.password = aros.org diff --git a/arch/all-android/bootstrap/mmakefile.src b/arch/all-android/bootstrap/mmakefile.src index c7b97d746b..1b11594042 100644 --- a/arch/all-android/bootstrap/mmakefile.src +++ b/arch/all-android/bootstrap/mmakefile.src @@ -10,15 +10,23 @@ USER_INCLUDES := -I$(SRCDIR)/arch/all-unix/bootstrap \ mainmmake=kernel-bootstrap-hosted maindir=arch/all-hosted/bootstrap arch=linux-android \ files=$(FILES) compiler=kernel -APP_FILES := res src .classpath .project AndroidManifest.xml +APP_DIRS := res src +APP_FILES := .classpath .project build.properties AndroidManifest.xml #MM android-bootstrap-setup: @$(ECHO) Setting up Android project... @cd $(GENDIR)/$(CURDIR); \ - for f in $(APP_FILES); do ln -nsf $(SRCDIR)/$(CURDIR)/app/$$f app/$$f; done; \ + for f in $(APP_DIRS) $(APP_FILES); do ln -nsf $(SRCDIR)/$(CURDIR)/app/$$f app/$$f; done; \ $(ANDROID) update project --path app --name AROSBootstrap +android-bootstrap-ant-build: + @$(ECHO) Buiding Android application... + @cd $(GENDIR)/$(CURDIR)/app; $(ANT) release + +android-bootstrap-no-ant: + @$(ECHO) Apache Ant is not installed, Android bootstrap is not built. + ifeq ($(ANT),) ANT_TARGET := android-bootstrap-no-ant else @@ -28,11 +36,4 @@ endif #MM android-bootstrap-build : $(ANT_TARGET) -android-bootstrap-ant-build: - @$(ECHO) Buiding Android application... - @cd $(GENDIR)/$(CURDIR)/app; $(ANT) release - -android-bootstrap-no-ant: - @$(ECHO) Apache Ant is not installed, Android bootstrap is not built. - %common -- 2.11.4.GIT