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

Commit d12139a2 authored by Ady Abraham's avatar Ady Abraham Committed by Android (Google) Code Review
Browse files

Merge "SurfaceFlinger: Enable -WConversion in Android.bp"

parents 92bd250e b0dbdaaf

libs/renderengine/tests/RenderEngineTest.cpp

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#include <chrono>

#include <condition_variable>

#include <fstream>
@@ -1339,3 +1343,6 @@ TEST_F(RenderEngineTest, drawLayers_fillShadow_translucentCasterWithAlpha) { 
}



} // namespace android



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"

services/surfaceflinger/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ cc_defaults { 
        "-Wthread-safety",

        "-Wunused",

        "-Wunreachable-code",

        "-Wconversion",

    ],

}

services/surfaceflinger/BufferLayer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



//#define LOG_NDEBUG 0

#undef LOG_TAG

#define LOG_TAG "BufferLayer"
@@ -795,3 +799,6 @@ void BufferLayer::updateCloneBufferInfo() { 
#if defined(__gl2_h_)

#error "don't include gl2/gl2.h in this file"

#endif



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"

services/surfaceflinger/BufferLayerConsumer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#undef LOG_TAG

#define LOG_TAG "BufferLayerConsumer"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS
@@ -519,3 +523,6 @@ BufferLayerConsumer::Image::~Image() { 
    }

}

}; // namespace android



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"

services/surfaceflinger/BufferQueueLayer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"



#undef LOG_TAG

#define LOG_TAG "BufferQueueLayer"

#define ATRACE_TAG ATRACE_TAG_GRAPHICS
@@ -612,3 +616,6 @@ void BufferQueueLayer::ContentsChangedListener::abandon() { 
// -----------------------------------------------------------------------



} // namespace android



// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic pop // ignored "-Wconversion"