commit b0cf0db3b0cac76db56328357a3902c2ae53f65e
author Ian Hua <ianhua@google.com> Wed Sep 15 15:10:06 2021 +0100
committer Miao Wang <miaowang@google.com> Mon May 23 13:05:06 2022 -0700
tree 7d4a88e1e4dfe3976dfbced09b5508792c3ebd24
parent afff8511105e0a23ae7f50e5e70b03d7b2743f7b

AIDL interface changes for NNAPI feature level 6.

- Add BATCH_MATMUL operation
- Support TENSOR_INT32 for RESHAPE operation.

Also update "current" version snapshot and use
android.hardware.neuralnetworks-V2-ndk since AIDL v1 has been frozen.

Cherrypicked from Iabe45c57e2306d61055f711eda03b80b9cbe906d

Bug: 206089870
Test: mm
Change-Id: Iabe45c57e2306d61055f711eda03b80b9cbe906d
Merged-In: Iabe45c57e2306d61055f711eda03b80b9cbe906d
(cherry picked from commit aaeda0e84fd04c4c54d12055e0ddd90b49972e3a)

neuralnetworks/utils/common/Android.bp

diff --git a/neuralnetworks/utils/common/Android.bp b/neuralnetworks/utils/common/Android.bp
index 2ed1e40..20cd1f2 100644
--- a/neuralnetworks/utils/common/Android.bp
+++ b/neuralnetworks/utils/common/Android.bp
@@ -35,7 +35,7 @@
         "neuralnetworks_types",
     ],
     shared_libs: [
-        "android.hardware.neuralnetworks-V1-ndk_platform",
+        "android.hardware.neuralnetworks-V2-ndk_platform",
         "libhidlbase",
         "libnativewindow",
         "libbinder_ndk",

neuralnetworks/utils/service/Android.bp

diff --git a/neuralnetworks/utils/service/Android.bp b/neuralnetworks/utils/service/Android.bp
index 5f36dff..ab996ce 100644
--- a/neuralnetworks/utils/service/Android.bp
+++ b/neuralnetworks/utils/service/Android.bp
@@ -39,7 +39,7 @@
         "neuralnetworks_utils_hal_common",
     ],
     shared_libs: [
-        "android.hardware.neuralnetworks-V1-ndk_platform",
+        "android.hardware.neuralnetworks-V2-ndk_platform",
         "android.hardware.neuralnetworks@1.0",
         "android.hardware.neuralnetworks@1.1",
         "android.hardware.neuralnetworks@1.2",