drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move frameworks/base over to libc++."

Browse Source
This commit is contained in:
Dan Albert
2014-11-12 21:11:48 +00:00
committed by Gerrit Code Review
parent 6e5b14c411 ff1d8a6635
commit 5e6cf24213
11 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/Android.mk
View File

@ -245,7 +245,6 @@ LOCAL_SHARED_LIBRARIES := \
libnetd_client \ libnetd_client \
libsoundtrigger \ libsoundtrigger \
libminikin \ libminikin \
libstlport \
libprocessgroup \ libprocessgroup \
libnativebridge \ libnativebridge \
@ -262,7 +261,6 @@ LOCAL_C_INCLUDES += bionic/libc/private
LOCAL_MODULE:= libandroid_runtime LOCAL_MODULE:= libandroid_runtime
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))

1
libs/hwui/Android.mk
View File

@ -115,7 +115,6 @@ ifeq ($(USE_OPENGL_RENDERER),true)
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)
include $(call all-makefiles-under,$(LOCAL_PATH)) include $(call all-makefiles-under,$(LOCAL_PATH))

2
libs/hwui/DisplayList.h
View File

@ -82,7 +82,7 @@ public:
LinearAllocator * const mAllocator; LinearAllocator * const mAllocator;
SkPath* allocPathForFrame() { SkPath* allocPathForFrame() {
mTempPaths.push_back(); mTempPaths.push_back(SkPath());
return &mTempPaths.back(); return &mTempPaths.back();
} }

6
libs/hwui/PathTessellator.cpp
View File

@ -289,14 +289,14 @@ void getStrokeVerticesFromUnclosedVertices(const PaintInfo& paintInfo,
} }
beginTheta += dTheta; beginTheta += dTheta;
Vector2 beginRadialOffset = {cos(beginTheta), sin(beginTheta)}; Vector2 beginRadialOffset = {cosf(beginTheta), sinf(beginTheta)};
paintInfo.scaleOffsetForStrokeWidth(beginRadialOffset); paintInfo.scaleOffsetForStrokeWidth(beginRadialOffset);
Vertex::set(&buffer[capOffset], Vertex::set(&buffer[capOffset],
vertices[0].x + beginRadialOffset.x, vertices[0].x + beginRadialOffset.x,
vertices[0].y + beginRadialOffset.y); vertices[0].y + beginRadialOffset.y);
endTheta += dTheta; endTheta += dTheta;
Vector2 endRadialOffset = {cos(endTheta), sin(endTheta)}; Vector2 endRadialOffset = {cosf(endTheta), sinf(endTheta)};
paintInfo.scaleOffsetForStrokeWidth(endRadialOffset); paintInfo.scaleOffsetForStrokeWidth(endRadialOffset);
Vertex::set(&buffer[allocSize - 1 - capOffset], Vertex::set(&buffer[allocSize - 1 - capOffset],
vertices[lastIndex].x + endRadialOffset.x, vertices[lastIndex].x + endRadialOffset.x,
@ -467,7 +467,7 @@ inline static void storeCapAA(const PaintInfo& paintInfo, const Vector<Vertex>&
for (int i = 0; i < extra; i++) { for (int i = 0; i < extra; i++) {
theta += dTheta; theta += dTheta;
Vector2 radialOffset = {cos(theta), sin(theta)}; Vector2 radialOffset = {cosf(theta), sinf(theta)};
// scale to compensate for pinching at sharp angles, see totalOffsetFromNormals() // scale to compensate for pinching at sharp angles, see totalOffsetFromNormals()
radialOffset *= radialScale; radialOffset *= radialScale;

1
media/mca/filterfw/Android.mk
View File

@ -49,5 +49,4 @@ LOCAL_SHARED_LIBRARIES := \
# part of a system image. # part of a system image.
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

6
media/mca/filterfw/jni/jni_util.h
View File

@ -16,7 +16,7 @@
#include <jni.h> #include <jni.h>
#include <hash_map> #include <unordered_map>
#include <string> #include <string>
#include "base/utilities.h" #include "base/utilities.h"
@ -188,8 +188,8 @@ class ObjectPool {
id_field_name_(id_fld_name), id_field_name_(id_fld_name),
next_id_(0) { } next_id_(0) { }
typedef std::hash_map<int, T*> CObjMap; typedef std::unordered_map<int, T*> CObjMap;
typedef std::hash_map<int, bool> FlagMap; typedef std::unordered_map<int, bool> FlagMap;
static ObjectPool* instance_; static ObjectPool* instance_;
std::string jclass_name_; std::string jclass_name_;
std::string id_field_name_; std::string id_field_name_;

3
media/mca/filterfw/native/libfilterfw.mk
View File

@ -18,9 +18,6 @@ FFW_PATH := $(call my-dir)
# Uncomment the requirements below, once we need them: # Uncomment the requirements below, once we need them:
# STLport
include external/stlport/libstlport.mk
# Neven FaceDetect SDK # Neven FaceDetect SDK
#LOCAL_C_INCLUDES += external/neven/FaceRecEm/common/src/b_FDSDK \ #LOCAL_C_INCLUDES += external/neven/FaceRecEm/common/src/b_FDSDK \
# external/neven/FaceRecEm/common/src \ # external/neven/FaceRecEm/common/src \

2
media/mca/filterpacks/Android.mk
View File

@ -30,8 +30,6 @@ LOCAL_CFLAGS := -DANDROID
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
## ##

2
packages/services/PacProcessor/jni/Android.mk
View File

@ -36,6 +36,4 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_MODULE := libjni_pacprocessor LOCAL_MODULE := libjni_pacprocessor
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
include external/stlport/libstlport.mk
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
services/core/jni/Android.mk
View File

@ -27,8 +27,6 @@ LOCAL_SRC_FILES += \
$(LOCAL_REL_DIR)/com_android_server_PersistentDataBlockService.cpp \ $(LOCAL_REL_DIR)/com_android_server_PersistentDataBlockService.cpp \
$(LOCAL_REL_DIR)/onload.cpp $(LOCAL_REL_DIR)/onload.cpp
include external/stlport/libstlport.mk
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \ $(JNI_H_INCLUDE) \
frameworks/base/services \ frameworks/base/services \

1
tools/aapt/Android.mk
View File

@ -167,7 +167,6 @@ LOCAL_STATIC_LIBRARIES := \
LOCAL_CFLAGS += $(aaptCFlags) LOCAL_CFLAGS += $(aaptCFlags)
LOCAL_CPPFLAGS += -Wno-non-virtual-dtor LOCAL_CPPFLAGS += -Wno-non-virtual-dtor
include external/stlport/libstlport.mk
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
endif # Not SDK_ONLY endif # Not SDK_ONLY