Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e6cf242 authored by Dan Albert's avatar Dan Albert Committed by Gerrit Code Review
Browse files

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

parents 6e5b14c4 ff1d8a66

core/jni/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -245,7 +245,6 @@ LOCAL_SHARED_LIBRARIES := \ 
	libnetd_client \

	libsoundtrigger \

	libminikin \

	libstlport \

	libprocessgroup \

	libnativebridge \
@@ -262,7 +261,6 @@ LOCAL_C_INCLUDES += bionic/libc/private 


LOCAL_MODULE:= libandroid_runtime



include external/stlport/libstlport.mk

include $(BUILD_SHARED_LIBRARY)



include $(call all-makefiles-under,$(LOCAL_PATH))

libs/hwui/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ ifeq ($(USE_OPENGL_RENDERER),true) 


    LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



    include external/stlport/libstlport.mk

    include $(BUILD_SHARED_LIBRARY)



    include $(call all-makefiles-under,$(LOCAL_PATH))

libs/hwui/DisplayList.h

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public: 
    LinearAllocator * const mAllocator;



    SkPath* allocPathForFrame() {

        mTempPaths.push_back();

        mTempPaths.push_back(SkPath());

        return &mTempPaths.back();

    }

libs/hwui/PathTessellator.cpp

+3 −3
Original line number Diff line number Diff line
@@ -289,14 +289,14 @@ void getStrokeVerticesFromUnclosedVertices(const PaintInfo& paintInfo, 
            }



            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 @@ inline static void storeCapAA(const PaintInfo& paintInfo, const Vector<Vertex>& 
        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;

media/mca/filterfw/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -49,5 +49,4 @@ LOCAL_SHARED_LIBRARIES := \ 
# part of a system image.

LOCAL_PRELINK_MODULE := false



include external/stlport/libstlport.mk

include $(BUILD_SHARED_LIBRARY)