diff options
author | Dan Albert <danalbert@google.com> | 2014-11-12 21:28:22 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 21:28:22 +0000 |
commit | dc81fbad809f08564199c8f08df7e7f72310961a (patch) | |
tree | f711bfae8ee7f619eb03e99b7a671fef6ec69ff9 /libs/minikin | |
parent | 253320d25fccbb49621926d49dcf5ef64cf529c6 (diff) | |
parent | 69d4fba2f2b7bb2c248cc0e78cf277a6e44665f8 (diff) | |
download | android_frameworks_minikin-dc81fbad809f08564199c8f08df7e7f72310961a.tar.gz android_frameworks_minikin-dc81fbad809f08564199c8f08df7e7f72310961a.tar.bz2 android_frameworks_minikin-dc81fbad809f08564199c8f08df7e7f72310961a.zip |
am 69d4fba2: Move frameworks/minikin over to libc++.
* commit '69d4fba2f2b7bb2c248cc0e78cf277a6e44665f8':
Move frameworks/minikin over to libc++.
Diffstat (limited to 'libs/minikin')
-rw-r--r-- | libs/minikin/Android.mk | 2 | ||||
-rw-r--r-- | libs/minikin/Layout.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/minikin/Android.mk b/libs/minikin/Android.mk index 386dc2b..60a46ef 100644 --- a/libs/minikin/Android.mk +++ b/libs/minikin/Android.mk @@ -15,7 +15,6 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -include external/stlport/libstlport.mk LOCAL_SRC_FILES := \ AnalyzeStyle.cpp \ @@ -43,7 +42,6 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libpng \ libz \ - libstlport \ libicuuc \ libutils diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp index fcae6cc..fa77701 100644 --- a/libs/minikin/Layout.cpp +++ b/libs/minikin/Layout.cpp @@ -17,12 +17,14 @@ #define LOG_TAG "Minikin" #include <cutils/log.h> -#include <string> -#include <vector> +#include <math.h> +#include <stdio.h> // for debugging + #include <algorithm> #include <fstream> #include <iostream> // for debugging -#include <stdio.h> // ditto +#include <string> +#include <vector> #include <utils/JenkinsHash.h> #include <utils/LruCache.h> |