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

Commit c331067a authored Nov 01, 2021 by Michael Butler

Move Aidl utility code to aidl/utils -- hal 2/2

This change is part of an effort to remove HAL types from
libneuralnetworks_common*. This change:
* Updates the header guard names for the new directory
* Removes the "Aidl" prefix from the files
* Adds temporary "Aidl" header files under include/ that redirect to
   their corresponding files in include/nnapi/hal/aidl/
* Changes references of libneuralnetworks_common_hidl to
   libneuralnetworks_common

Bug: 191442336
Test: mma
Change-Id: Icbcc04e0a49a9adf8d8826fd5735028ea26de0ca

parent 8fa53834

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_hidl",
		"libneuralnetworks_common",
		"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_common_hidl",
		"libneuralnetworks_common",
		],
		header_libs: [
		"libneuralnetworks_headers",
		@@ -81,7 +81,7 @@ cc_test {
		"libgmock",
		"libhidlmemory",
		"libneuralnetworks_generated_test_harness",
		"libneuralnetworks_common_hidl",
		"libneuralnetworks_common",
		],
		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_hidl",
		"libneuralnetworks_common",
		"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_common_hidl",
		"libneuralnetworks_common",
		],
		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_hidl",
		"libneuralnetworks_common",
		"neuralnetworks_types",
		"neuralnetworks_utils_hal_common",
		"neuralnetworks_utils_hal_1_0",