| commit | e6b6843c5fc19976677706518c4875a78cc736bb | [log] [tgz] |
|---|---|---|
| author | Dan Stoza <stoza@google.com> | Thu Mar 03 15:36:33 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Mar 03 15:36:33 2016 +0000 |
| tree | cd52b7cc16c0bb9dceea01221b6accc1e957047e | |
| parent | afcf267cbd86316cd98c96bc82400479c965d8d6 [diff] | |
| parent | 4b2a105055d37579f1d234c02f4e14c38ca3ed43 [diff] |
Merge ""#warning" conflict with -Werror"
diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index 5ff79a9..4a701e8 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp
@@ -134,7 +134,6 @@ mSurfaceFlingerConsumer->setName(mName); #ifdef TARGET_DISABLE_TRIPLE_BUFFERING -#warning "disabling triple buffering" mSurfaceFlingerConsumer->setDefaultMaxBufferCount(2); #else mSurfaceFlingerConsumer->setDefaultMaxBufferCount(3);