diff options
author | 2021-12-08 12:51:28 -0500 | |
---|---|---|
committer | 2021-12-13 20:59:28 -0500 | |
commit | c4158950ab3ccca0f307cee0a7497ee4ccee0490 (patch) | |
tree | c741a9fb114a111af37e3344da061731ec8d61db /libs/ui/StaticAsserts.cpp | |
parent | 6ddaa7ae121d42d87bf65b9ee2f6a11f4c1825f9 (diff) |
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
Diffstat (limited to 'libs/ui/StaticAsserts.cpp')
-rw-r--r-- | libs/ui/StaticAsserts.cpp | 24 |
1 files changed, 24 insertions, 0 deletions
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 <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)); |