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

Commit 7dbaaf19 authored by Zhiquan Liu's avatar Zhiquan Liu Committed by android-build-merger
Browse files

Merge ""#warning" conflict with -Werror" 

am: e6b6843c

* commit 'e6b6843c':
  "#warning" conflict with -Werror
parents 0e93732c e6b6843c

services/surfaceflinger/Layer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ void Layer::onFirstRef() { 
    mSurfaceFlingerConsumer->setName(mName);



#ifdef TARGET_DISABLE_TRIPLE_BUFFERING

#warning "disabling triple buffering"

    mSurfaceFlingerConsumer->setDefaultMaxBufferCount(2);

#else

    mSurfaceFlingerConsumer->setDefaultMaxBufferCount(3);