diff options
| author | Narayan Kamath <narayan@google.com> | 2014-10-29 12:12:37 +0000 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-10-29 12:12:37 +0000 |
| commit | 4ed472ab33e78391c0b084ed3908019e06b7dfe5 (patch) | |
| tree | 2135110bff4085ec90113a260f0a7eac519ba76b /libs | |
| parent | fa945c105b4f7bb3e3844e8ce467ca701d5f3a9f (diff) | |
| parent | 3028394c4691db9dec6bde04a7ed927e7501bd6a (diff) | |
| download | frameworks_base-4ed472ab33e78391c0b084ed3908019e06b7dfe5.zip frameworks_base-4ed472ab33e78391c0b084ed3908019e06b7dfe5.tar.gz frameworks_base-4ed472ab33e78391c0b084ed3908019e06b7dfe5.tar.bz2 | |
resolved conflicts for merge of 3028394c to stage-aosp-master
Change-Id: I980e4c95cdc6a4778cef3298338692656d23e7c6
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/Android.mk | 8 | ||||
| -rw-r--r-- | libs/hwui/Layer.h | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index 36185ae..5b74add 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -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) diff --git a/libs/hwui/Layer.h b/libs/hwui/Layer.h index a8e1c26..b264595 100644 --- a/libs/hwui/Layer.h +++ b/libs/hwui/Layer.h @@ -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. |