diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2011-09-28 12:40:37 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2011-09-28 16:47:49 +0200 |
| commit | f0149fe6eaa5e8ac121af39354950c73534482a3 (patch) | |
| tree | 5a077e50ab6344580d0d26e908e5d968c9c701af /postprocess | |
| parent | 69a1f550625b967c34a1468c7e83e22003bb0796 (diff) | |
Android now builds up to instsetoo_native
Last fixes - remove kludge from RepositoryFixes.mk, have redland
build w/o threads for the while, and some hackery to exclude
pointless code like oosplash from android build.
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/packcomponents/makefile.mk | 4 | ||||
| -rw-r--r-- | postprocess/packregistry/makefile.mk | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk index 8f23fc4a6dda..8c5a21463a2c 100644 --- a/postprocess/packcomponents/makefile.mk +++ b/postprocess/packcomponents/makefile.mk @@ -197,7 +197,7 @@ my_components += \ my_components += pythonloader .ENDIF -.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS" +.IF "$(OS)" != "WNT" && "$(OS)" != "MACOSX" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" my_components += component/desktop/unx/splash/splash .ENDIF @@ -316,7 +316,7 @@ my_components += \ component/vcl/vcl.windows .END -.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS" +.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "IOS" && "$(OS)" != "ANDROID" my_components += \ desktopbe1 \ component/vcl/vcl.unx diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk index b77b968a7831..f03a6407a28a 100644 --- a/postprocess/packregistry/makefile.mk +++ b/postprocess/packregistry/makefile.mk @@ -315,6 +315,8 @@ MY_FILES_main += \ # Inet-wnt.xcu must come after Inet.xcu .ELIF "$(GUIBASE)" == "cocoatouch" # ? +.ELIF "$(GUIBASE)" == "android" +# ? .ELSE ERROR : unknown-GUIBASE .END |