Move frameworks/base over to libc++.
Bug: 15193147
Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index 245e0d2..e6cd8ed 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -245,7 +245,6 @@
libnetd_client \
libsoundtrigger \
libminikin \
- libstlport \
libprocessgroup \
libnativebridge \
@@ -262,7 +261,6 @@
LOCAL_MODULE:= libandroid_runtime
-include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk
index a09355b..3e590a9 100644
--- a/libs/hwui/Android.mk
+++ b/libs/hwui/Android.mk
@@ -115,7 +115,6 @@
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
- include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 657632d..9eb8ae3 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -82,7 +82,7 @@
LinearAllocator * const mAllocator;
SkPath* allocPathForFrame() {
- mTempPaths.push_back();
+ mTempPaths.push_back(SkPath());
return &mTempPaths.back();
}
diff --git a/libs/hwui/PathTessellator.cpp b/libs/hwui/PathTessellator.cpp
index d842ed5..b3f779f 100644
--- a/libs/hwui/PathTessellator.cpp
+++ b/libs/hwui/PathTessellator.cpp
@@ -289,14 +289,14 @@
}
beginTheta += dTheta;
- Vector2 beginRadialOffset = {cos(beginTheta), sin(beginTheta)};
+ Vector2 beginRadialOffset = {cosf(beginTheta), sinf(beginTheta)};
paintInfo.scaleOffsetForStrokeWidth(beginRadialOffset);
Vertex::set(&buffer[capOffset],
vertices[0].x + beginRadialOffset.x,
vertices[0].y + beginRadialOffset.y);
endTheta += dTheta;
- Vector2 endRadialOffset = {cos(endTheta), sin(endTheta)};
+ Vector2 endRadialOffset = {cosf(endTheta), sinf(endTheta)};
paintInfo.scaleOffsetForStrokeWidth(endRadialOffset);
Vertex::set(&buffer[allocSize - 1 - capOffset],
vertices[lastIndex].x + endRadialOffset.x,
@@ -467,7 +467,7 @@
for (int i = 0; i < extra; i++) {
theta += dTheta;
- Vector2 radialOffset = {cos(theta), sin(theta)};
+ Vector2 radialOffset = {cosf(theta), sinf(theta)};
// scale to compensate for pinching at sharp angles, see totalOffsetFromNormals()
radialOffset *= radialScale;
diff --git a/media/mca/filterfw/Android.mk b/media/mca/filterfw/Android.mk
index a5b4b27..a63d635 100644
--- a/media/mca/filterfw/Android.mk
+++ b/media/mca/filterfw/Android.mk
@@ -49,5 +49,4 @@
# part of a system image.
LOCAL_PRELINK_MODULE := false
-include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/media/mca/filterfw/jni/jni_util.h b/media/mca/filterfw/jni/jni_util.h
index 68ff653..11c0871 100644
--- a/media/mca/filterfw/jni/jni_util.h
+++ b/media/mca/filterfw/jni/jni_util.h
@@ -16,7 +16,7 @@
#include <jni.h>
-#include <hash_map>
+#include <unordered_map>
#include <string>
#include "base/utilities.h"
@@ -188,8 +188,8 @@
id_field_name_(id_fld_name),
next_id_(0) { }
- typedef std::hash_map<int, T*> CObjMap;
- typedef std::hash_map<int, bool> FlagMap;
+ typedef std::unordered_map<int, T*> CObjMap;
+ typedef std::unordered_map<int, bool> FlagMap;
static ObjectPool* instance_;
std::string jclass_name_;
std::string id_field_name_;
diff --git a/media/mca/filterfw/native/libfilterfw.mk b/media/mca/filterfw/native/libfilterfw.mk
index 4e88e6f..69227ce2 100644
--- a/media/mca/filterfw/native/libfilterfw.mk
+++ b/media/mca/filterfw/native/libfilterfw.mk
@@ -18,9 +18,6 @@
# Uncomment the requirements below, once we need them:
-# STLport
-include external/stlport/libstlport.mk
-
# Neven FaceDetect SDK
#LOCAL_C_INCLUDES += external/neven/FaceRecEm/common/src/b_FDSDK \
# external/neven/FaceRecEm/common/src \
diff --git a/media/mca/filterpacks/Android.mk b/media/mca/filterpacks/Android.mk
index d030749..7e8661f 100644
--- a/media/mca/filterpacks/Android.mk
+++ b/media/mca/filterpacks/Android.mk
@@ -30,8 +30,6 @@
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
-include external/stlport/libstlport.mk
-
include $(BUILD_STATIC_LIBRARY)
##
diff --git a/packages/services/PacProcessor/jni/Android.mk b/packages/services/PacProcessor/jni/Android.mk
index f16c90b..26c56c9 100644
--- a/packages/services/PacProcessor/jni/Android.mk
+++ b/packages/services/PacProcessor/jni/Android.mk
@@ -36,6 +36,4 @@
LOCAL_MODULE := libjni_pacprocessor
LOCAL_MODULE_TAGS := optional
-include external/stlport/libstlport.mk
-
include $(BUILD_SHARED_LIBRARY)
diff --git a/services/core/jni/Android.mk b/services/core/jni/Android.mk
index 7996f73..99b3378 100644
--- a/services/core/jni/Android.mk
+++ b/services/core/jni/Android.mk
@@ -27,8 +27,6 @@
$(LOCAL_REL_DIR)/com_android_server_PersistentDataBlockService.cpp \
$(LOCAL_REL_DIR)/onload.cpp
-include external/stlport/libstlport.mk
-
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \
frameworks/base/services \
@@ -37,8 +35,8 @@
frameworks/native/services \
libcore/include \
libcore/include/libsuspend \
- $(call include-path-for, libhardware)/hardware \
- $(call include-path-for, libhardware_legacy)/hardware_legacy \
+ $(call include-path-for, libhardware)/hardware \
+ $(call include-path-for, libhardware_legacy)/hardware_legacy \
LOCAL_SHARED_LIBRARIES += \
libandroid_runtime \
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 6d3b73d..ba1411e 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -167,7 +167,6 @@
LOCAL_CFLAGS += $(aaptCFlags)
LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
-include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE)
endif # Not SDK_ONLY
