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

Commit a039340c authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Use -Werror in frameworks/native/libs/gui and ui" am: c4ebf5bb am:... 

Merge "Use -Werror in frameworks/native/libs/gui and ui" am: c4ebf5bb am: 3a566dd1 am: 14ac77cd
am: 6d560a52

Change-Id: I6b612a1fff0da31b16c1121d0f3d08abf407336c
parents ab5e67a5 6d560a52

include/private/ui/RegionHelper.h

+0 −1
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ public: 
            int inside = spanner.next(current.top, current.bottom);

            spannerInner.prepare(inside);

            do {

                TYPE left, right;

                int inner_inside = spannerInner.next(current.left, current.right);

                if ((op_mask >> inner_inside) & 1) {

                    if (current.left < current.right &&

libs/gui/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -25,9 +25,12 @@ cc_library_shared { 
    },



    clang: true,

    cflags: [

        "-Wall",

        "-Werror",

    ],

    cppflags: [

        "-Weverything",

        "-Werror",



        // The static constructors and destructors in this library have not been noted to

        // introduce significant overheads

libs/gui/Surface.cpp

+4 −1
Original line number Diff line number Diff line
@@ -153,7 +153,10 @@ status_t Surface::getDisplayRefreshCycleDuration(nsecs_t* outRefreshDuration) { 
    ATRACE_CALL();



    DisplayStatInfo stats;

    status_t err = composerService()->getDisplayStats(NULL, &stats);

    status_t result = composerService()->getDisplayStats(NULL, &stats);

    if (result != NO_ERROR) {

        return result;

    }



    *outRefreshDuration = stats.vsyncPeriod;

libs/gui/tests/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ cc_test { 
    test_suites: ["device-tests"],



    clang: true,

    cflags: [

        "-Wall",

        "-Werror",

    ],



    srcs: [

        "BufferItemConsumer_test.cpp",

libs/gui/tests/CpuConsumer_test.cpp

+0 −6
Original line number Diff line number Diff line
@@ -310,8 +310,6 @@ void checkGreyscaleBuffer(const CpuConsumer::LockedBuffer &buf) { 
    uint32_t h = buf.height;

    const int blockWidth = w > 16 ? w / 16 : 1;

    const int blockHeight = h > 16 ? h / 16 : 1;

    const int blockRows = h / blockHeight;

    const int blockCols = w / blockWidth;



    // Top-left square is bright

    checkPixel(buf, 0, 0, 191);
@@ -349,8 +347,6 @@ void checkRgba8888Buffer(const CpuConsumer::LockedBuffer &buf) { 
    uint32_t h = buf.height;

    const int blockWidth = w > 16 ? w / 16 : 1;

    const int blockHeight = h > 16 ? h / 16 : 1;

    const int blockRows = h / blockHeight;

    const int blockCols = w / blockWidth;



    // Top-left square is bright red

    checkPixel(buf, 0, 0, 191, 63, 63);
@@ -392,8 +388,6 @@ void checkBayerRawBuffer(const CpuConsumer::LockedBuffer &buf) { 
    uint32_t h = buf.height;

    const int blockWidth = (w > 16 ? w / 8 : 2) & ~0x1;

    const int blockHeight = (h > 16 ? h / 8 : 2) & ~0x1;

    const int blockRows = h / blockHeight;

    const int blockCols = w / blockWidth;



    // Top-left square is red

    checkPixel(buf, 0, 0, 1000, 200, 200);