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

Commit c4158950 authored by Leon Scroggins III's avatar Leon Scroggins III
Browse files

Assert that PIXEL_FORMAT_R_8 == AIDL version 

I4846327b29736ee811672801a683deb287342a8e added PIXEL_FORMAT_R_8 to
match the AIDL version, but due to tricky dependencies, it hardcoded the
constant, rather than referring to it directly. Add a static assert in
a new file verifying that they match.

Bug: 154720547
Bug: 209497983
Bug: 193170859
Test: make
Change-Id: I43fd2bc53eba8c9decc64fc9563c625f56c71798
parent 6ddaa7ae

libs/ui/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ cc_library_shared { 
        "HdrCapabilities.cpp",

        "PixelFormat.cpp",

        "PublicFormat.cpp",

        "StaticAsserts.cpp",

        "StaticDisplayInfo.cpp",

    ],

libs/ui/StaticAsserts.cpp

0 → 100644
+24 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include <ui/PixelFormat.h>

#include <aidl/android/hardware/graphics/common/PixelFormat.h>



// Ideally, PIXEL_FORMAT_R_8 would simply be defined to match the aidl PixelFormat, but

// PixelFormat.h (where PIXEL_FORMAT_R_8 is defined) is pulled in by builds for

// which there is no aidl build (e.g. Windows).

static_assert(android::PIXEL_FORMAT_R_8 ==static_cast<int32_t>(

                                  aidl::android::hardware::graphics::common::PixelFormat::R_8));