From 0a9d06e2b5cf75c3d6ba958026bfdf4745f576d6 Mon Sep 17 00:00:00 2001
From: The Android Open Source Project <initial-contribution@android.com>
Date: Wed, 18 Mar 2009 22:20:25 -0700
Subject: auto import //branches/master/...@140412

---
 Android.mk | 20 --------------------
 1 file changed, 20 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index 1ebddfa..a912d7f 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,3 @@
-# this is now the default FreeType build for Android
-#
-ifndef USE_FREETYPE
-USE_FREETYPE := 2.3.6
-endif
-
-ifeq ($(USE_FREETYPE),2.3.6)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -42,13 +35,6 @@ LOCAL_CFLAGS += -fPIC -DPIC
 LOCAL_CFLAGS += "-DDARWIN_NO_CARBON"
 LOCAL_CFLAGS += "-DFT2_BUILD_LIBRARY"
 
-# only enable this if you want to enable our ugly font hack
-# to be able to switch the system's font hinting at runtime
-# through our modified Development Settings. the change will
-# only happen when you reboot or restart an application
-#
-LOCAL_CFLAGS += -DANDROID_FONT_HACK=1
-
 # enable the FreeType internal memory debugger in the simulator
 # you need to define the FT2_DEBUG_MEMORY environment variable
 # when running the program to activate it. It will dump memory
@@ -58,11 +44,6 @@ ifeq ($(TARGET_SIMULATOR),true)
 LOCAL_CFLAGS += "-DFT_DEBUG_MEMORY"
 endif
 
-# the following activates the new experimental auto-hinter
-# one that should create less problems with a wide variety
-# of glyphs, including our double-decker "g"
-#LOCAL_CFLAGS += -DFT_OPTION_AUTOFIT2
-
 # the following is for testing only, and should not be used in final builds
 # of the product
 #LOCAL_CFLAGS += "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
@@ -74,5 +55,4 @@ endif
 LOCAL_MODULE:= libft2
 
 include $(BUILD_STATIC_LIBRARY)
-endif
 
-- 
cgit v1.2.3