Merge commit '055aee28cedc3' into klp-dev: am: 2051465f2e am: d7cab14288 am: cafd00b375 am: 4cea75b987 am: fb5baf6521 am: fa744d0a95 am: f77113a2f7 am: c10d8e4d3b am: e314d1ffe2 am: 75a1d7329b am: 9037e1d2ba am: 838ce87483 am: fead4c9960 am: a2b598aaa1
am: 4d1264b083
Change-Id: I4eb2c8470c792cad60917f25ee067cf44d8af854
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7db1d92
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,61 @@
+cc_library_shared {
+ name: "libft2",
+
+ // compile in ARM mode, since the glyph loader/renderer is a hotspot
+ // when loading complex pages in the browser
+ //
+ arch: {
+ arm: {
+ instruction_set: "arm",
+ },
+ },
+
+ srcs: [
+ "src/base/ftbbox.c",
+ "src/base/ftbitmap.c",
+ "src/base/ftfntfmt.c",
+ "src/base/ftfstype.c",
+ "src/base/ftglyph.c",
+ "src/base/ftlcdfil.c",
+ "src/base/ftstroke.c",
+ "src/base/fttype1.c",
+ "src/base/ftbase.c",
+ "src/base/ftsystem.c",
+ "src/base/ftinit.c",
+ "src/base/ftgasp.c",
+ "src/base/ftmm.c",
+ "src/gzip/ftgzip.c",
+ "src/raster/raster.c",
+ "src/sfnt/sfnt.c",
+ "src/smooth/smooth.c",
+ "src/autofit/autofit.c",
+ "src/truetype/truetype.c",
+ "src/cff/cff.c",
+ "src/psnames/psnames.c",
+ "src/pshinter/pshinter.c",
+ ],
+
+ export_include_dirs: ["include"],
+
+ cflags: [
+ "-W",
+ "-Wall",
+
+ "-fPIC",
+ "-DPIC",
+
+ "-DDARWIN_NO_CARBON",
+ "-DFT2_BUILD_LIBRARY",
+
+ "-O2",
+
+ // the following is for testing only, and should not be used in final
+ // builds of the product
+ // "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER",
+ ],
+
+ shared_libs: [
+ "libpng",
+ "libz",
+ ],
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 4a6df0a..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-# this is now the default FreeType build for Android
-#
-ifndef USE_FREETYPE
-USE_FREETYPE := 2.7
-endif
-
-ifeq ($(USE_FREETYPE),2.7)
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# compile in ARM mode, since the glyph loader/renderer is a hotspot
-# when loading complex pages in the browser
-#
-LOCAL_ARM_MODE := arm
-
-LOCAL_SRC_FILES:= \
- src/base/ftbbox.c \
- src/base/ftbitmap.c \
- src/base/ftfntfmt.c \
- src/base/ftfstype.c \
- src/base/ftglyph.c \
- src/base/ftlcdfil.c \
- src/base/ftstroke.c \
- src/base/fttype1.c \
- src/base/ftbase.c \
- src/base/ftsystem.c \
- src/base/ftinit.c \
- src/base/ftgasp.c \
- src/base/ftmm.c \
- src/gzip/ftgzip.c \
- src/raster/raster.c \
- src/sfnt/sfnt.c \
- src/smooth/smooth.c \
- src/autofit/autofit.c \
- src/truetype/truetype.c \
- src/cff/cff.c \
- src/psnames/psnames.c \
- src/pshinter/pshinter.c
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/include \
- external/libpng \
- external/zlib
-
-LOCAL_CFLAGS += -W -Wall
-LOCAL_CFLAGS += -fPIC -DPIC
-LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
-LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
-
-LOCAL_SHARED_LIBRARIES += libpng libz
-
-# the following is for testing only, and should not be used in final builds
-# of the product
-#LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
-
-LOCAL_CFLAGS += -O2
-
-LOCAL_MODULE:= libft2
-
-include $(BUILD_SHARED_LIBRARY)
-endif
