Kaydet (Commit) 406947c6 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Construct a .jar for use by future other Android-specific Java code, too

üst c0d26723
...@@ -15,13 +15,14 @@ arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1 ...@@ -15,13 +15,14 @@ arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1
cp $(1) $(OBJLOCAL)$(if $(2),/$(2)) cp $(1) $(OBJLOCAL)$(if $(2),/$(2))
endef endef
# The default target just builds # The default target just builds.
all: ndk-build
unset JAVA_HOME && ant debug # lo-bootstrap.jar is used from other LO apps than the test ones we
@echo 'Install it on the device with ant debug install' # include in the .apk here.
@echo 'Then run it with something like what "make run" does (see Makefile)'
ndk-build: all: build-ant lo-bootstrap.jar
build-ndk:
ndk-build V=1 ndk-build V=1
# #
# Copy shared libraries we need to libs/armeabi-v7a so that ant will # Copy shared libraries we need to libs/armeabi-v7a so that ant will
...@@ -51,7 +52,6 @@ ndk-build: ...@@ -51,7 +52,6 @@ ndk-build:
for F in i18npool_test_breakiterator; do \ for F in i18npool_test_breakiterator; do \
$(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \ $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \
done done
# #
# Other "programs" # Other "programs"
$(call COPY,$(OUTDIR)/bin/uno,libunoexe.so) $(call COPY,$(OUTDIR)/bin/uno,libunoexe.so)
...@@ -101,8 +101,17 @@ ndk-build: ...@@ -101,8 +101,17 @@ ndk-build:
sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$${F}.rdb >assets/lib/$${F}.rdb; \ sed -e 's!uri="./!uri="$(APP_DATA_PATH)/lib/!g' <$(SRC_ROOT)/testtools/$(INPATH)/lib/$${F}.rdb >assets/lib/$${F}.rdb; \
done done
install: ndk-build build-ant: build-ndk
unset JAVA_HOME && ant debug
install: build-ndk
unset JAVA_HOME && ant debug install unset JAVA_HOME && ant debug install
@echo
@echo 'Run it with something like what "make run" does (see Makefile)'
@echo
lo-bootstrap.jar: build-ant
cd bin/classes && jar cvf ../../lo-bootstrap.jar fi/iki/tml org/libreoffice/android/Bootstrap.class
run: install run: install
# Note: these are just examples. # Note: these are just examples.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment