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

Commit cb2c37f7 authored Oct 05, 2021 by Xusong Wang Committed by Michael Butler Oct 25, 2021

Provide explicitly versioned NNAPI AIDL utils libs -- HAL.

This CL modifies the AIDL utils libraries to be explicitly
versioned. Currently, we only have two versions: v1 and "current".
Specifically, the following changes are made:
- Remove AIDL dependencies from neuralnetworks_utils_hal_common
- Create explicitly versioned libs of neuralnetworks_utils_hal_aidl_*

This is needed because it is not allowed for a build target to
link against multiple versions of the same AIDL lirary.

The canonical driver will report ANDROID_S for AIDL v1, and FL6 for v2.

Bug: 202405342
Test: NNT_static
Test: CtsNNAPITestCases
Test: VtsHalNeuralnetworksTargetTest
Change-Id: I74f1798e80a059949e43e0567d23e884a7f7c92d
Merged-In: I74f1798e80a059949e43e0567d23e884a7f7c92d
(cherry picked from commit 9763a953)

parent 32250df3

neuralnetworks/1.0/utils/Android.bp

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,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",