diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-11-16 13:40:22 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-11-16 16:07:03 +0000 |
| commit | fb7d4ba1cbe24b74dfab0f54eeffe898a0291ce3 (patch) | |
| tree | 179aa2c28935ea4c805290afb63f37a5cbccde56 /external/cairo | |
| parent | dc65f048fd1b08d17e71e4d3a3a3c114aae871e6 (diff) | |
build cairo on android
Change-Id: Ie2f7662a4cc3955963517f265894b8f6a495ece8
Reviewed-on: https://gerrit.libreoffice.org/19991
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/cairo')
| -rw-r--r-- | external/cairo/ExternalPackage_cairo.mk | 4 | ||||
| -rw-r--r-- | external/cairo/ExternalPackage_pixman.mk | 5 | ||||
| -rw-r--r-- | external/cairo/ExternalProject_cairo.mk | 5 | ||||
| -rw-r--r-- | external/cairo/ExternalProject_pixman.mk | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/external/cairo/ExternalPackage_cairo.mk b/external/cairo/ExternalPackage_cairo.mk index e40fc5496489..720927670c39 100644 --- a/external/cairo/ExternalPackage_cairo.mk +++ b/external/cairo/ExternalPackage_cairo.mk @@ -11,6 +11,10 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,cairo,cairo)) $(eval $(call gb_ExternalPackage_use_external_project,cairo,cairo)) +ifneq ($(OS),ANDROID) + $(eval $(call gb_ExternalPackage_add_file,cairo,$(LIBO_LIB_FOLDER)/libcairo.so.2,src/.libs/libcairo.so.2.11000.2)) +endif + # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalPackage_pixman.mk b/external/cairo/ExternalPackage_pixman.mk index ead02895cdf6..c08a775012d6 100644 --- a/external/cairo/ExternalPackage_pixman.mk +++ b/external/cairo/ExternalPackage_pixman.mk @@ -11,6 +11,11 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,pixman,pixman)) $(eval $(call gb_ExternalPackage_use_external_project,pixman,pixman)) +ifneq ($(OS),ANDROID) + $(eval $(call gb_ExternalPackage_add_file,pixman,$(LIBO_LIB_FOLDER)/libpixman-1.so.0,pixman/.libs/libpixman-1.so.0.24.4)) +endif + + # vim: set noet sw=4 ts=4: diff --git a/external/cairo/ExternalProject_cairo.mk b/external/cairo/ExternalProject_cairo.mk index cc26096f23d6..d204514a29db 100644 --- a/external/cairo/ExternalProject_cairo.mk +++ b/external/cairo/ExternalProject_cairo.mk @@ -32,7 +32,7 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : $(call gb_ExternalProject_run,build,\ ./configure \ $(if $(debug),STRIP=" ") \ - CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS)" \ + CFLAGS="$(if $(debug),-g) $(ZLIB_CFLAGS) $(gb_VISIBILITY_FLAGS)" \ $(if $(filter ANDROID IOS,$(OS)),PKG_CONFIG=./dummy_pkg_config) \ pixman_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,pixman)/pixman" \ pixman_LIBS="-L$(call gb_UnpackedTarball_get_dir,pixman)/pixman/.libs -lpixman-1" \ @@ -40,7 +40,10 @@ $(call gb_ExternalProject_get_state_target,cairo,build) : ZLIB3RDLIB="$(if $(SYSTEM_ZLIB),,-L$(WORKDIR)/LinkTarget/StaticLibrary) -lz" \ png_REQUIRES="trick_configure_into_using_png_CFLAGS_and_LIBS" \ png_CFLAGS="$(LIBPNG_CFLAGS)" png_LIBS="$(LIBPNG_LIBS)" \ + FREETYPE_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,freetype)/include" \ + FONTCONFIG_CFLAGS="-I$(call gb_UnpackedTarball_get_dir,fontconfig)" \ $(if $(filter IOS,$(OS)),--disable-shared,--disable-static) \ + $(if $(filter ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID IOS,$(OS)),--disable-xlib,--enable-xlib) \ $(if $(filter IOS,$(OS)),--enable-quartz --enable-quartz-font) \ --disable-valgrind \ diff --git a/external/cairo/ExternalProject_pixman.mk b/external/cairo/ExternalProject_pixman.mk index 8eb7d8ce9498..bbb4081420b0 100644 --- a/external/cairo/ExternalProject_pixman.mk +++ b/external/cairo/ExternalProject_pixman.mk @@ -32,7 +32,7 @@ else $(call gb_ExternalProject_get_state_target,pixman,build) : $(call gb_ExternalProject_run,build,\ ./configure \ - $(if $(filter MACOSX IOS,$(OS)),--disable-shared,--disable-static) \ + $(if $(filter MACOSX IOS ANDROID,$(OS)),--disable-shared,--disable-static) \ $(if $(filter ANDROID,$(OS)),--disable-arm-simd --disable-arm-neon --disable-arm-iwmmxt) \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ |