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

Commit e8645c3b authored by Michael Butler's avatar Michael Butler
Browse files

Relocate NN ProtectCallback to 1.0/utils 

This change is part of a larger chain of changes to remove HIDL and AIDL
libraries from neuralnetworks_utils_hal_common.

Bug: N/A
Test: mma
Change-Id: Ib43f1cb683a09ae5c9116a6dea4d269c9c2c78b4
parent 15965821

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/Callbacks.h

+2 −1
Original line number Diff line number Diff line
@@ -24,9 +24,10 @@ 
#include <nnapi/Result.h>

#include <nnapi/Types.h>

#include <nnapi/hal/CommonUtils.h>

#include <nnapi/hal/ProtectCallback.h>

#include <nnapi/hal/TransferValue.h>



#include "nnapi/hal/1.0/ProtectCallback.h"



// See hardware/interfaces/neuralnetworks/utils/README.md for more information on HIDL interface

// lifetimes across processes and for protecting asynchronous calls across HIDL.

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/Device.h

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
#include <nnapi/Result.h>

#include <nnapi/Types.h>

#include <nnapi/hal/CommonUtils.h>

#include <nnapi/hal/ProtectCallback.h>



#include "nnapi/hal/1.0/ProtectCallback.h"



#include <functional>

#include <memory>

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/Execution.h

+1 −1
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ 
#include <nnapi/Result.h>

#include <nnapi/Types.h>

#include <nnapi/hal/CommonUtils.h>

#include <nnapi/hal/ProtectCallback.h>



#include "PreparedModel.h"

#include "nnapi/hal/1.0/ProtectCallback.h"



#include <memory>

#include <utility>

neuralnetworks/1.0/utils/include/nnapi/hal/1.0/PreparedModel.h

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 
#include <nnapi/Result.h>

#include <nnapi/Types.h>

#include <nnapi/hal/CommonUtils.h>

#include <nnapi/hal/ProtectCallback.h>



#include "nnapi/hal/1.0/ProtectCallback.h"



#include <memory>

#include <tuple>

neuralnetworks/utils/common/include/nnapi/hal/ProtectCallback.h→neuralnetworks/1.0/utils/include/nnapi/hal/1.0/ProtectCallback.h

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_PROTECT_CALLBACK_H

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_PROTECT_CALLBACK_H

#ifndef ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_PROTECT_CALLBACK_H

#define ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_PROTECT_CALLBACK_H



#include <android-base/scopeguard.h>

#include <android-base/thread_annotations.h>
@@ -98,4 +98,4 @@ class DeathHandler final { 


}  // namespace android::hardware::neuralnetworks::utils



#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_UTILS_COMMON_PROTECT_CALLBACK_H
 
#endif  // ANDROID_HARDWARE_INTERFACES_NEURALNETWORKS_1_0_UTILS_PROTECT_CALLBACK_H