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

Commit 4ed472ab authored by Narayan Kamath's avatar Narayan Kamath
Browse files

resolved conflicts for merge of 3028394c to stage-aosp-master 

Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
parents fa945c10 3028394c

libs/hwui/Android.mk

+8 −0
Original line number Diff line number Diff line
@@ -2,6 +2,14 @@ LOCAL_PATH:= $(call my-dir) 
include $(CLEAR_VARS)

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk



# Too many unused parameters in external/skia/include and this directory.

# getConfig in external/skia/include/core/SkBitmap.h is deprecated.

# Allow Gnu extension: in-class initializer of static 'const float' member.

LOCAL_CLANG_CFLAGS += \

    -Wno-unused-parameter \

    -Wno-deprecated-declarations \

    -Wno-gnu-static-float-init



# Only build libhwui when USE_OPENGL_RENDERER is

# defined in the current device/board configuration

ifeq ($(USE_OPENGL_RENDERER),true)

libs/hwui/Layer.h

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ class RenderState; 
class OpenGLRenderer;

class RenderNode;

class DeferredDisplayList;

class DeferStateStruct;

struct DeferStateStruct;



/**

 * A layer has dimensions and is backed by an OpenGL texture or FBO.