diff options
| author | Dan Albert <danalbert@google.com> | 2014-11-12 21:31:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-12 21:31:35 +0000 |
| commit | e8b4a1b78a29878c89659860a7b7fa5605b3be0e (patch) | |
| tree | 73c57e0f27d1f1d1a1bf36ef50d0c4467e171db3 | |
| parent | 92065a6f3f8bf1a97c57f2f7c22aee750c0ce3b8 (diff) | |
| parent | dc81fbad809f08564199c8f08df7e7f72310961a (diff) | |
| download | android_frameworks_minikin-e8b4a1b78a29878c89659860a7b7fa5605b3be0e.tar.gz android_frameworks_minikin-e8b4a1b78a29878c89659860a7b7fa5605b3be0e.tar.bz2 android_frameworks_minikin-e8b4a1b78a29878c89659860a7b7fa5605b3be0e.zip | |
am dc81fbad: am 69d4fba2: Move frameworks/minikin over to libc++.
* commit 'dc81fbad809f08564199c8f08df7e7f72310961a':
Move frameworks/minikin over to libc++.
| -rw-r--r-- | libs/minikin/Android.mk | 2 | ||||
| -rw-r--r-- | libs/minikin/Layout.cpp | 8 | ||||
| -rw-r--r-- | sample/Android.mk | 4 |
3 files changed, 5 insertions, 9 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 5ad3bfc..7479547 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> diff --git a/sample/Android.mk b/sample/Android.mk index ec06e38..101a413 100644 --- a/sample/Android.mk +++ b/sample/Android.mk @@ -15,7 +15,6 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -include external/stlport/libstlport.mk LOCAL_MODULE_TAGS := tests @@ -31,7 +30,6 @@ LOCAL_SHARED_LIBRARIES += \ libutils \ liblog \ libcutils \ - libstlport \ libharfbuzz_ng \ libicuuc \ libft2 \ @@ -45,7 +43,6 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) -include external/stlport/libstlport.mk LOCAL_MODULE_TAG := tests @@ -63,7 +60,6 @@ LOCAL_SHARED_LIBRARIES += \ libutils \ liblog \ libcutils \ - libstlport \ libharfbuzz_ng \ libicuuc \ libskia \ |