* changes:
[automerger skipped] Merge changes from topic "FixSRGBSetColorMode_VTS_qt-dev" into qt-dev am: 818fff840a am: 66f932c583 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
[automerger skipped] DO NOT MERGE: Fixing SRGB for devices that do not support SRGB color mode am: 2f3553e1ed am: c055afc896 -s ours am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
[automerger skipped] VTS : fix vts fail [1/1] am: 70e5b556ef am: 4818d467d7 -s ours am skip reason: change_id I5eebe5f530e3b62037d669992cf2eca0849f10be with SHA1 0d7f7882e7 is in history
am: 66f932c583 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
Change-Id: I9080e758a6a01c78399d8b88982c678f397500dc
am: c055afc896 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
Change-Id: I9fa08273e63339a91107b7dbbda975fbd98d664f
am: 7f42547069 -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
Change-Id: I9a94e1ff207c90ba20043e03e54b185057052cc6
am: 4818d467d7 -s ours
am skip reason: change_id I5eebe5f530e3b62037d669992cf2eca0849f10be with SHA1 0d7f7882e7 is in history
Change-Id: I5dfa2cf7c0889e58c175fffa4eb0e3e9007419d0
am: 818fff840a -s ours
am skip reason: change_id Ie8f53effe3e6e29a4523ebfa450c79fdf96ed585 with SHA1 37d1599e0b is in history
Change-Id: I78053cd905db78c02ea6848a4b0fc9fb3d619b3c
The VTS Callback files are a subset of the Callback files in
frameworks/ml/nn/runtime/Callbacks.*. This CL syncs the implementations,
removing the functionality that is not needed in VTS.
Fixes: 132322149
Test: mma
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Change-Id: I114ce7f3b6c3d58de0196e9508209614d0a73e11
Merged-In: I114ce7f3b6c3d58de0196e9508209614d0a73e11
(cherry picked from commit 23d0e562e0)
Having separate VTS models and tests for difference HAL version. This
compiler flag is no longer needed.
Bug: 122740334
Test: All VTS 1.x and 1.xCompat1.y
Change-Id: Idbd96a954da9bd5a0e0e66afd9120d84a1efc784
Merged-In: Idbd96a954da9bd5a0e0e66afd9120d84a1efc784
(cherry picked from commit 7763d53545)
To make it easier to create the next version of NNAPI, this change
removes the following nonsensical dependence:
- NNAPI 1.0 VTS depends on NNAPI 1.1 and 1.2
- NNAPI 1.1 VTS depends on NNAPI 1.2
In particular, I made the following changes:
- split GeneratedTestHarness.cpp into three separate implementations,
- created a restricted version of Callbacks.h for 1.0 and 1.1,
- removed the dependency on frameworks/ml/nn/HalInterfaces.h,
- refactored Android.bp files for more autonomy between 1.0, 1.1, and 1.2,
- consolidated some common code into Utils.h,
- created structure for sharing code between VTS versions (VtsHalNeuralNetworksV1_0_utils).
Bug: 74827824
Bug: 124462414
Test: VtsHalNeuralnetworksV1_0TargetTest
Test: VtsHalNeuralnetworksV1_1TargetTest
Test: VtsHalNeuralnetworksV1_1CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_0TargetTest
Test: VtsHalNeuralnetworksV1_2CompatV1_1TargetTest
Change-Id: I4243d0b5e574255cef1070850f4d0a284f65f54e
Merged-In: I4243d0b5e574255cef1070850f4d0a284f65f54e
(cherry picked from commit 1d6b465997)
Changes to the VTS test to support OEM's who use a separate
dedicated SAP interface.
Note: This is a VTS test change only. The default implementation does
not still support a dedicated SAP interface (OEM's can obviously
customize the default implementation for their devices).
Bug: 136645414
Test: None (verified by partner OEM)
Change-Id: I42b87bf90cfa90c7c218309164ab2b77f3685f9e
