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

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

Browse Source 
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
This commit is contained in:
Narayan Kamath
2014-10-29 12:12:37 +00:00
parent fa945c105b 3028394c46
commit 4ed472ab33
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/Android.mk
View File

@ -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)

2
libs/hwui/Layer.h
View File

@ -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.