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

Commit 3b85d645 authored by David Gross's avatar David Gross Committed by Gerrit Code Review
Browse files

Merge changes from topic "fl7-test" into android12-tests-dev 

* changes:
  FL7: Refine MIRROR_PAD specification
  FL7: Refine REVERSE specification
  FL7: Add some AIDL_V3 test infrastructure
  Freeze neuralnetworks AIDL version as v3 for FL7
  Add NNAPI specification and infrastructure for FL7.
parents a84a1266 810aaa0a

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ 
    </hal>

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

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

        <version>1-2</version>

        <version>1-3</version>

        <interface>

            <name>IDevice</name>

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

neuralnetworks/1.3/vts/functional/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ cc_test { 
        "VtsHalNeuralNetworksV1_0_utils",

        "VtsHalNeuralNetworksV1_2_utils",

        "VtsHalNeuralNetworksV1_3_utils",

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

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

        "android.hardware.neuralnetworks@1.0",

        "android.hardware.neuralnetworks@1.1",

        "android.hardware.neuralnetworks@1.2",

neuralnetworks/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -37,5 +37,6 @@ aidl_interface { 
    versions: [

        "1",

        "2",

        "3",

    ],

}

neuralnetworks/aidl/aidl_api/android.hardware.neuralnetworks/3/.hash

0 → 100644
+1 −0
Original line number Diff line number Diff line 
8c2c4ca2327e6f779dad6119c03d832ea4e1def1

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

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

 * Copyright (C) 2020 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.neuralnetworks;

@VintfStability

parcelable BufferDesc {

  int[] dimensions;

}