From c4158950ab3ccca0f307cee0a7497ee4ccee0490 Mon Sep 17 00:00:00 2001 From: Leon Scroggins III Date: Wed, 8 Dec 2021 12:51:28 -0500 Subject: 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 --- libs/ui/StaticAsserts.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 libs/ui/StaticAsserts.cpp (limited to 'libs/ui/StaticAsserts.cpp') diff --git a/libs/ui/StaticAsserts.cpp b/libs/ui/StaticAsserts.cpp new file mode 100644 index 0000000000..85da64f10e --- /dev/null +++ b/libs/ui/StaticAsserts.cpp @@ -0,0 +1,24 @@ +/* + * 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 +#include + +// 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( + aidl::android::hardware::graphics::common::PixelFormat::R_8)); -- cgit v1.2.3-59-g8ed1b