From be769bd215d778655df7cf4ba068a6cfa77390be Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Fri, 21 Aug 2015 13:49:29 -0400 Subject: [PATCH] examples/calculator: fix Android version to use nit_activity only MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This is a partial revert of cbbb5225. The entrypoint of `android` use `native_app_glue`, which led to craming 2 activities in the apk file. Signed-off-by: Alexis Laferrière --- examples/calculator/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/calculator/Makefile b/examples/calculator/Makefile index 7e5ad0d..ed20940 100644 --- a/examples/calculator/Makefile +++ b/examples/calculator/Makefile @@ -10,7 +10,7 @@ bin/calculator: $(shell ${NITLS} -M src/calculator.nit -m linux) ${NITC} bin/calculator.apk: $(shell ${NITLS} -M src/calculator.nit -m android) ${NITC} ../../contrib/inkscape_tools/bin/svg_to_icons mkdir -p bin res ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/ - ${NITC} -o $@ src/calculator.nit -m android + ${NITC} -o $@ src/calculator.nit -m ../../lib/android/ui/ ../../contrib/inkscape_tools/bin/svg_to_icons: make -C ../../contrib/inkscape_tools/ -- 1.7.9.5