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

Commit 8fc48903 authored Nov 01, 2021 by Michael Butler Committed by Automerger Merge Worker Nov 01, 2021

Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL.""...

Merge "Revert^2 "Provide explicitly versioned NNAPI AIDL utils libs -- HAL."" am: be7f81f5 am: 1f711eed

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1875575

Change-Id: I272fba248b0a023e91347be18230118a08014c27

parents a2f7571a 1f711eed

neuralnetworks/1.0/utils/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -55,7 +55,7 @@ cc_test {
		static_libs: [
		"android.hardware.neuralnetworks@1.0",
		"libgmock",
		"libneuralnetworks_common",
		"libneuralnetworks_common_hidl",
		"neuralnetworks_types",
		"neuralnetworks_utils_hal_common",
		"neuralnetworks_utils_hal_1_0",

neuralnetworks/1.0/vts/functional/Android.bp

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ cc_library_static {
		"libgmock",
		"libhidlmemory",
		"libneuralnetworks_generated_test_harness",
		"libneuralnetworks_utils",
		"libneuralnetworks_common_hidl",
		],
		header_libs: [
		"libneuralnetworks_headers",
		@@ -81,7 +81,7 @@ cc_test {
		"libgmock",
		"libhidlmemory",
		"libneuralnetworks_generated_test_harness",
		"libneuralnetworks_utils",
		"libneuralnetworks_common_hidl",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",

neuralnetworks/1.1/utils/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ cc_test {
		"android.hardware.neuralnetworks@1.0",
		"android.hardware.neuralnetworks@1.1",
		"libgmock",
		"libneuralnetworks_common",
		"libneuralnetworks_common_hidl",
		"neuralnetworks_types",
		"neuralnetworks_utils_hal_common",
		"neuralnetworks_utils_hal_1_0",

neuralnetworks/1.1/vts/functional/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ cc_test {
		"libgmock",
		"libhidlmemory",
		"libneuralnetworks_generated_test_harness",
		"libneuralnetworks_utils",
		"libneuralnetworks_common_hidl",
		],
		whole_static_libs: [
		"neuralnetworks_generated_V1_0_example",

neuralnetworks/1.2/utils/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ cc_test {
		"android.hardware.neuralnetworks@1.1",
		"android.hardware.neuralnetworks@1.2",
		"libgmock",
		"libneuralnetworks_common",
		"libneuralnetworks_common_hidl",
		"neuralnetworks_types",
		"neuralnetworks_utils_hal_common",
		"neuralnetworks_utils_hal_1_0",