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

Commit c1e4c064 authored by John Reck's avatar John Reck
Browse files

Add ABI check to IMapper5 

Bug: 254345788
Test: Make change, verify build fails
Change-Id: Ib97b26f1483293b0461c47184ae39c48b9404b0f
parent 05631762

graphics/mapper/stable-c/Android.bp

+19 −0
Original line number Diff line number Diff line
@@ -35,6 +35,25 @@ cc_library_headers { 
    ],

}



cc_library_shared {

    name: "libimapper_stablec_abicheck",

    visibility: ["//visibility:private"],

    defaults: [

        "android.hardware.graphics.allocator-ndk_shared",

        "android.hardware.graphics.common-ndk_shared",

    ],

    header_libs: [

        "libimapper_stablec",

    ],

    srcs: [

        "imapper5_abicheck.cpp",

    ],

    header_abi_checker: {

        enabled: true,

        symbol_file: "imapper.map.txt",

    },

}



cc_library_headers {

    name: "libimapper_providerutils",

    vendor_available: true,

graphics/mapper/stable-c/imapper.map.txt

0 → 100644
+4 −0
Original line number Diff line number Diff line 
LIBIMAPPER { # introduced=UpsideDownCake

  global:

    AIMapper_loadIMapper;

}

graphics/mapper/stable-c/imapper5_abicheck.cpp

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

 * Copyright (C) 2022 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 <android/hardware/graphics/mapper/IMapper.h>



AIMapper_Error AIMapper_loadIMapper(AIMapper* _Nullable* _Nonnull outImplementation) {

    static AIMapper mapper = {AIMAPPER_VERSION_5, {}};

    *outImplementation = &mapper;

    return AIMAPPER_ERROR_NONE;

}
 
 No newline at end of file

graphics/mapper/stable-c/include/android/hardware/graphics/mapper/IMapper.h

+1 −3
Original line number Diff line number Diff line
@@ -26,10 +26,8 @@ 


#pragma once



#include <stdint.h>

#include <sys/cdefs.h>

#include <cinttypes>

#include <cstddef>

#include <type_traits>



#include <android/rect.h>

#include <cutils/native_handle.h>