summaryrefslogtreecommitdiffstats
path: root/libs
diff options
context:
space:
mode:
Diffstat (limited to 'libs')
-rw-r--r--libs/minikin/Android.mk2
-rw-r--r--libs/minikin/Layout.cpp8
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>