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

Commit d720ec1d authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Move Canvas"

parents 63ae9f33 849911a9
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ LOCAL_SRC_FILES:= \
    android/graphics/Rasterizer.cpp \
    android/graphics/Region.cpp \
    android/graphics/Shader.cpp \
    android/graphics/SkiaCanvas.cpp \
    android/graphics/SurfaceTexture.cpp \
    android/graphics/Typeface.cpp \
    android/graphics/TypefaceImpl.cpp \
+0 −19
Original line number Diff line number Diff line
/*
 * Copyright (C) 2014 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

// This header is shared with other libraries and as such is located in a
// separate directory.
#include <private/graphics/Canvas.h>
+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@
#include "GraphicsJNI.h"
#include "core_jni_helpers.h"

#include "Canvas.h"
#include <Canvas.h>
#include "SkDrawFilter.h"
#include "SkGraphics.h"
#include "SkPorterDuff.h"
+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ LOCAL_SRC_FILES := \
    RenderState.cpp \
    ResourceCache.cpp \
    ShadowTessellator.cpp \
    SkiaCanvas.cpp \
    SkiaShader.cpp \
    Snapshot.cpp \
    SpotShadow.cpp \
+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE := libhwui
LOCAL_MODULE_TAGS := optional

include $(LOCAL_PATH)/Android.common.mk

Loading