firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 8bbd29fc: am a4e238f7: Move frameworks/minikin over to libc++.

Browse Source 
* commit '8bbd29fce5fb17fb86d9fd2f79028c949c66d20a':
  Move frameworks/minikin over to libc++.
This commit is contained in:
Dan Albert 2014-11-12 21:31:35 +00:00 committed by Android Git Automerger
commit 46e3118bfd
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/src/flutter/libs/minikin/Android.mk
View File

@ -15,7 +15,6 @@
LOCAL_PATH := $(call my-dir) LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
include external/stlport/libstlport.mk
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
AnalyzeStyle.cpp \ AnalyzeStyle.cpp \
@ -43,7 +42,6 @@ LOCAL_SHARED_LIBRARIES := \
liblog \ liblog \
libpng \ libpng \
libz \ libz \
libstlport \
libicuuc \ libicuuc \
libutils libutils

8
engine/src/flutter/libs/minikin/Layout.cpp
View File

@ -17,12 +17,14 @@
#define LOG_TAG "Minikin" #define LOG_TAG "Minikin"
#include <cutils/log.h> #include <cutils/log.h>
#include <string> #include <math.h>
#include <vector> #include <stdio.h> // for debugging
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>
#include <iostream> // for debugging #include <iostream> // for debugging
#include <stdio.h> // ditto #include <string>
#include <vector>
#include <utils/JenkinsHash.h> #include <utils/JenkinsHash.h>
#include <utils/LruCache.h> #include <utils/LruCache.h>

4
engine/src/flutter/sample/Android.mk
View File

@ -15,7 +15,6 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS) include $(CLEAR_VARS)
include external/stlport/libstlport.mk
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
@ -31,7 +30,6 @@ LOCAL_SHARED_LIBRARIES += \
libutils \ libutils \
liblog \ liblog \
libcutils \ libcutils \
libstlport \
libharfbuzz_ng \ libharfbuzz_ng \
libicuuc \ libicuuc \
libft2 \ libft2 \
@ -45,7 +43,6 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS) include $(CLEAR_VARS)
include external/stlport/libstlport.mk
LOCAL_MODULE_TAG := tests LOCAL_MODULE_TAG := tests
@ -63,7 +60,6 @@ LOCAL_SHARED_LIBRARIES += \
libutils \ libutils \
liblog \ liblog \
libcutils \ libcutils \
libstlport \
libharfbuzz_ng \ libharfbuzz_ng \
libicuuc \ libicuuc \
libskia \ libskia \