Migrate NNAPI runtime to canonical types
This change replaces most uses of HAL types in the codebase with
equivalent canonical types. Later changes will introduce more
refactorings.
Also removes unused files nn/runtime/test/Bridge.{h,cpp}.
Bug: 160669906
Fix: 155923931
Test: NeuralNetworksTest_static (all 7 passes)
Test: NeuralNetworksTest_operations
Test: NeuralNetworksTest_utils
Test: NeuralNetworksTest_logtag
Test: nnCache_test
Test: BlobCache_test
Change-Id: I63fa286e926a096948f1b1b172d1d562c4f52f29
Merged-In: I63fa286e926a096948f1b1b172d1d562c4f52f29
(cherry picked from commit daa4b515bc15a2ac7755f0666c023d7e3caa951a)
diff --git a/common/Android.bp b/common/Android.bp
index 202c69e..10f97a2 100644
--- a/common/Android.bp
+++ b/common/Android.bp
@@ -109,6 +109,12 @@
],
whole_static_libs: [
"libarect",
+ "neuralnetworks_types",
+ "neuralnetworks_utils_hal_1_0", // TODO(b/160669116): Remove VNDK dependencies.
+ "neuralnetworks_utils_hal_1_1",
+ "neuralnetworks_utils_hal_1_2",
+ "neuralnetworks_utils_hal_1_3",
+ "neuralnetworks_utils_hal_common",
],
cflags: [
"-DTF_LITE_DISABLE_X86_NEON",
@@ -204,6 +210,12 @@
whole_static_libs: [
"libarect",
"libtflite_kernel_utils",
+ "neuralnetworks_types",
+ "neuralnetworks_utils_hal_1_0", // TODO(b/160669116): Remove VNDK dependencies.
+ "neuralnetworks_utils_hal_1_1",
+ "neuralnetworks_utils_hal_1_2",
+ "neuralnetworks_utils_hal_1_3",
+ "neuralnetworks_utils_hal_common",
"philox_random",
],
static_libs: [
@@ -232,6 +244,12 @@
name: "neuralnetworks_utils_defaults",
host_supported: true,
vendor_available: true,
+ apex_available: [
+ "//apex_available:platform",
+ "com.android.neuralnetworks",
+ "test_com.android.neuralnetworks",
+ ],
+ min_sdk_version: "30",
cflags: [
"-Wall",
"-Werror",
