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

Commit 40b8f09c authored by Lev Proleev's avatar Lev Proleev Committed by Android (Google) Code Review
Browse files

Merge changes from topic "nnapi_aidl_sample_driver" 

* changes:
  Implement VTS tests for NNAPI AIDL interface
  Add utils for AIDL types conversions
  Create first version of NNAPI AIDL interface
parents 761c50e1 b38bb4f1

compatibility_matrices/compatibility_matrix.current.xml

+7 −0
Original line number Diff line number Diff line
@@ -397,6 +397,13 @@ 
            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.neuralnetworks</name>

        <interface>

            <name>IDevice</name>

            <regex-instance>.*</regex-instance>

        </interface>

    </hal>

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

        <name>android.hardware.nfc</name>

        <version>1.2</version>

neuralnetworks/1.3/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ cc_test { 
        "VtsHalNeuralNetworksV1_0_utils",

        "VtsHalNeuralNetworksV1_2_utils",

        "VtsHalNeuralNetworksV1_3_utils",

        "android.hardware.neuralnetworks-V1-ndk_platform",

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

neuralnetworks/aidl/Android.bp

0 → 100644
+27 −0
Original line number Diff line number Diff line 
aidl_interface {

    name: "android.hardware.neuralnetworks",

    vendor_available: true,

    srcs: [

        "android/hardware/neuralnetworks/*.aidl",

    ],

    stability: "vintf",

    imports: [

        "android.hardware.common",

    ],

    backend: {

        java: {

            enabled: false,

        },

        cpp: {

            enabled: false,

        },

        ndk: {

            apex_available: [

                "//apex_available:platform",

                "com.android.neuralnetworks",

                "test_com.android.neuralnetworks",

            ],

            min_sdk_version: "30",

        },

    },

}

neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/current/android/hardware/neuralnetworks/BufferDesc.aidl

0 → 100644
+22 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

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

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



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files 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.neuralnetworks;

@VintfStability

parcelable BufferDesc {

  int[] dimensions;

}

neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/current/android/hardware/neuralnetworks/BufferRole.aidl

0 → 100644
+24 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

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

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



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

//

// You must not make a backward incompatible changes to the AIDL files 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.neuralnetworks;

@VintfStability

parcelable BufferRole {

  int modelIndex;

  int ioIndex;

  float frequency;

}