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

Commit 57da8421 authored by Leon Scroggins's avatar Leon Scroggins Committed by Android (Google) Code Review
Browse files

Merge "Assert that PIXEL_FORMAT_R_8 == AIDL version"

parents 71870407 c4158950
Loading
Loading
Loading
Loading
+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",
    ],

+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));