Move frameworks/minikin over to libc++.

Bug: 15193147
Change-Id: I5e15c95415c39515340e2663acd5fd26666db720
This commit is contained in:
Dan Albert
2014-11-11 19:32:48 -08:00
parent 6cba4a1dca
commit a4e238f757
3 changed files with 5 additions and 9 deletions

View File

@@ -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

View File

@@ -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>

View File

@@ -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 \