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

Commit 4346ad0f authored by John Reck's avatar John Reck Committed by Gerrit Code Review
Browse files

Merge "IMapper 5 - the Stable C approach"

parents 92f223a9 97f31374

compatibility_matrices/compatibility_matrix.current.xml

+2 −2
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ 
    </hal>

    <hal format="aidl" optional="true">

        <name>android.hardware.graphics.allocator</name>

        <version>1</version>

        <version>1-2</version>

        <interface>

            <name>IAllocator</name>

            <instance>default</instance>
@@ -344,7 +344,7 @@ 
            <instance>default</instance>

        </interface>

    </hal>

    <hal format="hidl" optional="false">

    <hal format="hidl" optional="true">

        <name>android.hardware.graphics.mapper</name>

        <!-- New, non-Go devices should use 4.0, tested in vts_treble_vintf_vendor_test -->

        <version>2.1</version>

graphics/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ package { 
cc_defaults {

    name: "android.hardware.graphics.allocator-ndk_static",

    static_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.allocator-V2-ndk",

    ],

}



cc_defaults {

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

    shared_libs: [

        "android.hardware.graphics.allocator-V1-ndk",

        "android.hardware.graphics.allocator-V2-ndk",

    ],

}

graphics/allocator/aidl/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ aidl_interface { 
        enabled: true,

        support_system_process: true,

    },

    vndk_use_version: "1",

    vndk_use_version: "2",

    srcs: ["android/hardware/graphics/allocator/*.aidl"],

    imports: [

        "android.hardware.common-V2",

graphics/allocator/aidl/aidl_api/android.hardware.graphics.allocator/current/android/hardware/graphics/allocator/BufferDescriptorInfo.aidl

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

 * Copyright 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.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.graphics.allocator;

@VintfStability

parcelable BufferDescriptorInfo {

  byte[128] name;

  int width;

  int height;

  int layerCount;

  android.hardware.graphics.common.PixelFormat format = android.hardware.graphics.common.PixelFormat.UNSPECIFIED;

  android.hardware.graphics.common.BufferUsage usage = android.hardware.graphics.common.BufferUsage.CPU_READ_NEVER;

  long reservedSize;

}

graphics/allocator/aidl/aidl_api/android.hardware.graphics.allocator/current/android/hardware/graphics/allocator/IAllocator.aidl

+6 −0
Original line number Diff line number Diff line
@@ -34,5 +34,11 @@ 
package android.hardware.graphics.allocator;

@VintfStability

interface IAllocator {

  /**

   * @deprecated As of android.hardware.graphics.allocator-V2, this is deprecated & replaced with allocate2

   */

  android.hardware.graphics.allocator.AllocationResult allocate(in byte[] descriptor, in int count);

  android.hardware.graphics.allocator.AllocationResult allocate2(in android.hardware.graphics.allocator.BufferDescriptorInfo descriptor, in int count);

  boolean isSupported(in android.hardware.graphics.allocator.BufferDescriptorInfo descriptor);

  String getIMapperLibrarySuffix();

}