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

Commit 1ce7cbce authored by Marin Shalamanov's avatar Marin Shalamanov Committed by Android (Google) Code Review
Browse files

Merge "SF: Compile with -Wextra"

parents ea3f4fc7 bed7fd35

libs/renderengine/tests/RenderEngineTest.cpp

+2 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wextra"



#include <chrono>

#include <condition_variable>
@@ -1844,4 +1845,4 @@ TEST_P(RenderEngineTest, testRoundedCornersCrop) { 
} // namespace android



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

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

services/surfaceflinger/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ cc_defaults { 
    cflags: [

        "-Wall",

        "-Werror",

        "-Wextra",

        "-Wformat",

        "-Wthread-safety",

        "-Wunused",

services/surfaceflinger/BufferQueueLayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wextra"



#undef LOG_TAG

#define LOG_TAG "BufferQueueLayer"
@@ -661,4 +662,4 @@ void BufferQueueLayer::ContentsChangedListener::abandon() { 
} // namespace android



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

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

services/surfaceflinger/BufferStateLayer.cpp

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wextra"



//#define LOG_NDEBUG 0

#undef LOG_TAG
@@ -870,4 +871,4 @@ uint32_t BufferStateLayer::doTransaction(uint32_t flags) { 
} // namespace android



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

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

services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayColorProfile.h

+2 −1
Original line number Diff line number Diff line
@@ -22,11 +22,12 @@ 
// TODO(b/129481165): remove the #pragma below and fix conversion issues

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wconversion"

#pragma clang diagnostic ignored "-Wextra"



#include <ui/GraphicTypes.h>



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

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

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



namespace android {