[Libreoffice-commits] .: Branch 'feature/android-single-dso' - postprocess/packcomponents

[Libreoffice Gerrit user]

 postprocess/packcomponents/makefile.mk |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 733f4a631c389053fe10ace09523b35ebea11eb9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sun Oct 7 11:06:02 2012 +0300

    Bypass ODBC here, too
    
    Change-Id: Ie9a49e9521741038a06dc46a1bd9072088e3bf6b

diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a40841a..40fd602 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -145,10 +145,15 @@ my_components += \
     component/connectivity/source/dbtools/dbtools \
     component/connectivity/source/drivers/flat/flat \
     component/connectivity/source/drivers/mysql/mysql \
-    component/connectivity/source/drivers/odbc/odbc \
     component/connectivity/source/manager/sdbc2 \
     component/shell/source/backends/localebe/localebe1 \
 
+.IF "$(OS)" != "ANDROID" && "$(OS)" != "IOS"
+my_components += \
+    component/connectivity/source/drivers/odbc/odbc \
+
+.ENDIF
+
 .ENDIF
 
 .IF "$(BUILD_TYPE)" != "$(BUILD_TYPE:s/DESKTOP//)"