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

Commit 53b8aa9d authored by Michael Butler's avatar Michael Butler Committed by Automerger Merge Worker
Browse files

Merge "Remove unnecessary NNAPI header files" am: 9ec39aa0 am: 340e03f4... 

Merge "Remove unnecessary NNAPI header files" am: 9ec39aa0 am: 340e03f4 am: 970d671c am: b40584fd

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1880752

Change-Id: I38e03a9c288afff981364be8a2a5462252094162
parents 29af1fe8 b40584fd

neuralnetworks/aidl/utils/include/AidlBufferTracker.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "nnapi/hal/aidl/BufferTracker.h"

neuralnetworks/aidl/utils/include/AidlHalInterfaces.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "nnapi/hal/aidl/HalInterfaces.h"

neuralnetworks/aidl/utils/include/AidlHalUtils.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "nnapi/hal/aidl/HalUtils.h"

neuralnetworks/aidl/utils/include/AidlValidateHal.h

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



#include "nnapi/hal/aidl/ValidateHal.h"

neuralnetworks/aidl/utils/src/Buffer.cpp

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 


#include "Conversions.h"

#include "Utils.h"

#include "nnapi/hal/aidl/Conversions.h"



#include <memory>

#include <utility>