Commit Graph

8 Commits

Author SHA1 Message Date
Michael Butler
dd53d04d8c Improve the structure of NNAPI AIDL Memory
Prior to this change, the NN AIDL HAL created a Memory struct analogous
to hidl_memory, consisting of a name, size, and native handle. However,
this Memory struct is not very structured, and requires both the client
and server to agree on how the data should be interpreted.

This CL tightens the structure of the Memory representation by
introducing Ashmem and MappableFile structs to android.hardware.common
in order to hold specific file descriptors representing memory regions.
Further, this CL redefines android.hardwre.neuralnetworks's Memory
object as a union of the Ashmem, MappableFile, and (existing)
HardwareBuffer memory types.

This change also adds "com.android.neuralnetworks" to the graphics
AIDL HAL's apex_available build rule.

Bug: 183118727
Test: mma
Change-Id: I32322df676b83597c9e95f13662c322a6a80accc
Merged-In: I32322df676b83597c9e95f13662c322a6a80accc
(cherry picked from commit 1158c80ff6)
2021-04-07 12:54:18 -07:00
Devin Moore
14b2cbe96d Move AIDL FMQ types from android.hardware.common
Moved the types to andrdoid.hardware.common.fmq.
This allows modules to depend on the unstable version of the library
without conflicting with modules that depend on the stable version of
android.hardware.common.

Test: atest fmq_unit_tests fmq_test
Bug: 142326204
Change-Id: I3091f52c4e763a15fd9a1b7451a1455a06fb4c30
2020-10-09 13:00:16 -07:00
Devin Moore
dd61a8901d Reland "Add template parameters to MQDescriptor"
b26628ac32

Bug: 142326204

Change-Id: I78d08f84231ca19905f51b0520ede1b71df34365
2020-09-22 17:33:14 +00:00
Diego Wilson
b26628ac32 Revert "Add template parameters to MQDescriptor"
Revert "Change payload type to int32_t for fmq device tests"

Revert submission 1431616-thirtytwo

Reason for revert: This topic broke the aosp_x86-userdebug target. Details at http://b/169077648

Reverted Changes:
If736389eb:Add template parameters to MQDescriptor
Ice9c28c3d:Change HIDL fmq tests to use int32_t for payload
Ia18d8459b:Add template arguments to MQDescriptor for AIDL
I95586cc83:Change payload type to int32_t for fmq device test...

Change-Id: Ib7c409b164c76517d642a415cdfc2406e4f2f351
2020-09-21 19:36:49 +00:00
Devin Moore
340f895d30 Add template parameters to MQDescriptor
First parameter is used to determine the type of the payload, and the
second parameter is used to determine the type of queue.
Added two types to be use in that second parameter.
SynchronizedReadWrite and UnsynchronizedWrite.

Test: atest fmq_unit_tests fmq_test
Bug: 142326204

Change-Id: If736389ebecd02b87879850714606523e5145579
2020-09-18 10:55:15 -07:00
Devin Moore
f3eaf31e3b Clean up android.hardware.common types
Removed unnecessary 'flags' and 'fdIndex' fields from GrantorDescriptor.
Added additional comments for clarity.

Test: builds
Bug: 142326204
Change-Id: Id818ceb593ba2837d56dbfb3351d2127ec50b7ed
2020-08-17 17:43:32 -07:00
Devin Moore
1b34d67b7a Adding AidlMQDescriptor and GrantorDescriptor
Adding these two types to android.hardware.common for future use with
Fast Message Queue in libfmq.

Also adding to the mq_test_service to test them.

Test: system/tools/hidl/tests/run_all_device_tests.sh

Bug: 142326204

Change-Id: I424c4849c822436f58e40f206b09ffdf9baf260b
2020-08-14 09:21:22 -07:00
Pawin Vongmasa
ae120eef52 Add AIDL type for HardwareBuffer
This includes other types needed by HardwareBuffer.

Test: Builds

Bug: 145839204
Change-Id: I86c9d2f0cb04b597da9a93b7b6210b041312e1ac
Merged-In: I86c9d2f0cb04b597da9a93b7b6210b041312e1ac
(cherry picked from commit d535133127)
2020-07-15 14:36:31 -07:00