Fixed bug 2801 - Improvement of Android build

Sylvain Currently the Android build compiles both SDL_ttf and FreeType2 at the same time. This patch considers FreeType2 as a distinct project with its own Android.mk file. FreeType is compiled as a dependency of SDL_ttf.
libsdl-org · Sep 10, 2017 · 7a71744 · 7a71744
1 parent decabc8
commit 7a71744
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 49 deletions.
diff --git a/Android.mk b/Android.mk
@@ -1,62 +1,26 @@
-LOCAL_PATH := $(call my-dir)
+# Save the local path
+my_LOCAL_PATH := $(call my-dir)
 
+FREETYPE_LIBRARY_PATH := external/freetype-2.4.12
+
+# Build freetype library
+ifneq ($(FREETYPE_LIBRARY_PATH),)
+    include $(my_LOCAL_PATH)/$(FREETYPE_LIBRARY_PATH)/Android.mk
+endif
+
+# Restore local path
+LOCAL_PATH := $(my_LOCAL_PATH)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := SDL2_ttf
 
-FREETYPE_LIBRARY_PATH := external/freetype-2.4.12
-
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_SRC_FILES := SDL_ttf.c \
+LOCAL_SRC_FILES := SDL_ttf.c
 
 ifneq ($(FREETYPE_LIBRARY_PATH),)
     LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(FREETYPE_LIBRARY_PATH)/include
-    LOCAL_CFLAGS += -DFT2_BUILD_LIBRARY
-    LOCAL_SRC_FILES += \
-        $(FREETYPE_LIBRARY_PATH)/src/autofit/autofit.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbase.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbbox.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbdf.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftbitmap.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftcid.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftdebug.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftfstype.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftgasp.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftglyph.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftgxval.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftinit.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftlcdfil.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftmm.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftotval.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftpatent.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftpfr.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftstroke.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftsynth.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftsystem.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/fttype1.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftwinfnt.c \
-        $(FREETYPE_LIBRARY_PATH)/src/base/ftxf86.c \
-        $(FREETYPE_LIBRARY_PATH)/src/bdf/bdf.c \
-        $(FREETYPE_LIBRARY_PATH)/src/bzip2/ftbzip2.c \
-        $(FREETYPE_LIBRARY_PATH)/src/cache/ftcache.c \
-        $(FREETYPE_LIBRARY_PATH)/src/cff/cff.c \
-        $(FREETYPE_LIBRARY_PATH)/src/cid/type1cid.c \
-        $(FREETYPE_LIBRARY_PATH)/src/gzip/ftgzip.c \
-        $(FREETYPE_LIBRARY_PATH)/src/lzw/ftlzw.c \
-        $(FREETYPE_LIBRARY_PATH)/src/pcf/pcf.c \
-        $(FREETYPE_LIBRARY_PATH)/src/pfr/pfr.c \
-        $(FREETYPE_LIBRARY_PATH)/src/psaux/psaux.c \
-        $(FREETYPE_LIBRARY_PATH)/src/pshinter/pshinter.c \
-        $(FREETYPE_LIBRARY_PATH)/src/psnames/psmodule.c \
-        $(FREETYPE_LIBRARY_PATH)/src/raster/raster.c \
-        $(FREETYPE_LIBRARY_PATH)/src/sfnt/sfnt.c \
-        $(FREETYPE_LIBRARY_PATH)/src/smooth/smooth.c \
-        $(FREETYPE_LIBRARY_PATH)/src/tools/apinames.c \
-        $(FREETYPE_LIBRARY_PATH)/src/truetype/truetype.c \
-        $(FREETYPE_LIBRARY_PATH)/src/type1/type1.c \
-        $(FREETYPE_LIBRARY_PATH)/src/type42/type42.c \
-        $(FREETYPE_LIBRARY_PATH)/src/winfonts/winfnt.c
+    LOCAL_STATIC_LIBRARIES += freetype
 endif
 
 LOCAL_SHARED_LIBRARIES := SDL2

diff --git a/external/freetype-2.4.12/Android.mk b/external/freetype-2.4.12/Android.mk
@@ -0,0 +1,63 @@
+LOCAL_PATH:= $(call my-dir)
+
+include $(CLEAR_VARS)
+
+
+LOCAL_SRC_FILES := \
+        ./src/autofit/autofit.c \
+        ./src/base/ftbase.c \
+        ./src/base/ftbbox.c \
+        ./src/base/ftbdf.c \
+        ./src/base/ftbitmap.c \
+        ./src/base/ftcid.c \
+        ./src/base/ftdebug.c \
+        ./src/base/ftfstype.c \
+        ./src/base/ftgasp.c \
+        ./src/base/ftglyph.c \
+        ./src/base/ftgxval.c \
+        ./src/base/ftinit.c \
+        ./src/base/ftlcdfil.c \
+        ./src/base/ftmm.c \
+        ./src/base/ftotval.c \
+        ./src/base/ftpatent.c \
+        ./src/base/ftpfr.c \
+        ./src/base/ftstroke.c \
+        ./src/base/ftsynth.c \
+        ./src/base/ftsystem.c \
+        ./src/base/fttype1.c \
+        ./src/base/ftwinfnt.c \
+        ./src/base/ftxf86.c \
+        ./src/bdf/bdf.c \
+        ./src/bzip2/ftbzip2.c \
+        ./src/cache/ftcache.c \
+        ./src/cff/cff.c \
+        ./src/cid/type1cid.c \
+        ./src/gzip/ftgzip.c \
+        ./src/lzw/ftlzw.c \
+        ./src/pcf/pcf.c \
+        ./src/pfr/pfr.c \
+        ./src/psaux/psaux.c \
+        ./src/pshinter/pshinter.c \
+        ./src/psnames/psmodule.c \
+        ./src/raster/raster.c \
+        ./src/sfnt/sfnt.c \
+        ./src/smooth/smooth.c \
+        ./src/tools/apinames.c \
+        ./src/truetype/truetype.c \
+        ./src/type1/type1.c \
+        ./src/type42/type42.c \
+        ./src/winfonts/winfnt.c
+
+
+
+LOCAL_C_INCLUDES += $(LOCAL_PATH)/include
+LOCAL_CFLAGS += -DFT2_BUILD_LIBRARY -Os
+
+
+LOCAL_MODULE:= freetype
+
+LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
+LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
+
+include $(BUILD_STATIC_LIBRARY)
+