android/experimental/LibreOffice4Android/Makefile |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 4cf30c6c2a27edfe12016e1306a033d1db071b43
Author: Tor Lillqvist <t...@iki.fi>
Date:   Wed Nov 21 19:57:57 2012 +0200

    Save more space: compress the .rdb files in the .apk
    
    This means they will have to be uncompressed and copied into actual
    files when the app runs for the first time, but that is a small price
    to pay for reducing the .apk size with over ten megabytes.
    
    Change-Id: I5bcf3c228197519edd1ca8cbd804b5f027d7699d

diff --git a/android/experimental/LibreOffice4Android/Makefile 
b/android/experimental/LibreOffice4Android/Makefile
index bcea6e6..94ca89a 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -39,11 +39,11 @@ copy-stuff:
 # android/qa/desktop/Makefile (mmeeks's desktop demo, also works to some
 # extent).
 #
-       mkdir -p assets/bin/ure assets/lib assets/program assets/xml/ure 
assets/ComponentTarget/i18npool/util
-       cp $(OUTDIR)/bin/offapi.rdb assets/bin
-       cp $(OUTDIR)/bin/oovbaapi.rdb assets/bin
-       cp $(OUTDIR)/bin/types.rdb assets/bin
-       cp $(OUTDIR)/bin/ure/types.rdb assets/bin/ure
+       mkdir -p assets/gz.unpack/program/ure assets/lib assets/program 
assets/xml/ure assets/ComponentTarget/i18npool/util
+       gzip -9 <$(OUTDIR)/bin/offapi.rdb >assets/gz.unpack/program/offapi.rdb
+       gzip -9 <$(OUTDIR)/bin/oovbaapi.rdb 
>assets/gz.unpack/program/oovbaapi.rdb
+       gzip -9 <$(OUTDIR)/bin/types.rdb >assets/gz.unpack/program/types.rdb
+       gzip -9 <$(OUTDIR)/bin/ure/types.rdb 
>assets/gz.unpack/program/ure/types.rdb
 # For some reason the vnd.sun.star.expand:$LO_LIB_DIR doesn't seem to work, it 
expands to empty!?
 # So just hardcode the known APP_DATA_PATH for now...
        for F in xml/services xml/ure/services; do \
@@ -82,13 +82,13 @@ copy-stuff:
        echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc
        echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry 
module:$${BRAND_BASE_DIR}/share/registry/modules 
res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc
        echo 
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >> 
assets/program/fundamentalrc
-       echo 'URE_MORE_TYPES=file:///assets/bin/ure/types.rdb 
file:///assets/bin/types.rdb file:///assets/bin/offapi.rdb 
file:///assets/bin/oovbaapi.rdb' >> assets/program/fundamentalrc
+       echo 'URE_MORE_TYPES=$(APP_DATA_PATH)/program/offapi.rdb 
$(APP_DATA_PATH)/program/oovbaapi.rdb' >> assets/program/fundamentalrc
        echo 'URE_MORE_SERVICES=file:///assets/xml/services.rdb 
<$$BRAND_BASE_DIR/program/services>*' >> assets/program/fundamentalrc
 #
 # Set up unorc
        echo '[Bootstrap]' > assets/program/unorc
        echo "URE_INTERNAL_LIB_DIR=file://$(APP_DATA_PATH)/lib/" >> 
assets/program/unorc
-       echo 'UNO_TYPES=file:///assets/bin/ure/types.rdb 
file:///assets/bin/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc
+       echo 'UNO_TYPES=$(APP_DATA_PATH)/program/ure/types.rdb 
$(APP_DATA_PATH)/program/types.rdb $${URE_MORE_TYPES}' >> assets/program/unorc
        echo 'UNO_SERVICES=file:///assets/xml/ure/services.rdb 
$${URE_MORE_SERVICES}' >> assets/program/unorc
 #
 # Set up bootstraprc
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to