diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-10 20:54:07 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-10 21:29:52 -0800 |
| commit | edaecc1db0584fa017822dfc2da0c968b53967e6 (patch) | |
| tree | dc2db79f490bc2e334c6e3688e099c98e846f381 /libs/hwui/renderthread | |
| parent | baa73b056cbd4627a84b39a6267065ae56677220 (diff) | |
| download | frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.zip frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.tar.gz frameworks_base-edaecc1db0584fa017822dfc2da0c968b53967e6.tar.bz2 | |
resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp
(cherry picked from commit 1272887050a269d6d506b42099c2857847ad100b)
Change-Id: Ib673768fe5fc03615626ef4b10590e5317f22172
Diffstat (limited to 'libs/hwui/renderthread')
| -rw-r--r-- | libs/hwui/renderthread/RenderProxy.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/renderthread/RenderTask.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libs/hwui/renderthread/RenderProxy.cpp b/libs/hwui/renderthread/RenderProxy.cpp index 5d55ea6..3d106b7 100644 --- a/libs/hwui/renderthread/RenderProxy.cpp +++ b/libs/hwui/renderthread/RenderProxy.cpp @@ -345,8 +345,12 @@ CREATE_BRIDGE0(fence) { return NULL; } +template <typename T> +void UNUSED(T t) {} + void RenderProxy::fence() { SETUP_TASK(fence); + UNUSED(args); postAndWait(task); } diff --git a/libs/hwui/renderthread/RenderTask.cpp b/libs/hwui/renderthread/RenderTask.cpp index 7ca61e4..13970ba 100644 --- a/libs/hwui/renderthread/RenderTask.cpp +++ b/libs/hwui/renderthread/RenderTask.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +// LOG_TAG is being provided by the Makefile, reset. +#ifdef LOG_TAG +#undef LOG_TAG +#endif #define LOG_TAG "RenderTask" #include "RenderTask.h" |