summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjungshik <jungshik@google.com>2016-01-18 12:13:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-18 12:13:55 +0000
commitaba9adcf1ed71d3dd02b9976506fc3409fc2c56e (patch)
treeb1978d538433d333d26b2f9f88991f1daf6f091d
parentd57fa79d705368aa82569420e4d89d23fd49377b (diff)
parent638ea6c2028a6b5b961f07508b0e1e14d7dc62b8 (diff)
downloadandroid_external_freetype-staging/cm-14.0.tar.gz
android_external_freetype-staging/cm-14.0.tar.bz2
android_external_freetype-staging/cm-14.0.zip
Merge "Update the version number in Android.mk"staging/cm-14.0
am: 638ea6c202 * commit '638ea6c2028a6b5b961f07508b0e1e14d7dc62b8': Update the version number in Android.mk
-rw-r--r--Android.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index b2b780b..138ac69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,10 +1,10 @@
# this is now the default FreeType build for Android
#
ifndef USE_FREETYPE
-USE_FREETYPE := 2.6.0
+USE_FREETYPE := 2.6.2
endif
-ifeq ($(USE_FREETYPE),2.6.0)
+ifeq ($(USE_FREETYPE),2.6.2)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)