Merge "Update NN types include guards"
diff --git a/common/types/include/ActivationFunctor.h b/common/types/include/ActivationFunctor.h
index 4e28e34..55ccf8d 100644
--- a/common/types/include/ActivationFunctor.h
+++ b/common/types/include/ActivationFunctor.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_ACTIVATION_FUNCTOR_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_ACTIVATION_FUNCTOR_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_ACTIVATION_FUNCTOR_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_ACTIVATION_FUNCTOR_H
#include <android/log.h>
@@ -59,4 +59,4 @@
ActivationFn act_;
};
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_ACTIVATION_FUNCTOR_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_ACTIVATION_FUNCTOR_H
diff --git a/common/types/include/AndroidVersionUtil.h b/common/types/include/AndroidVersionUtil.h
index 13ddf33..4d71cfc 100644
--- a/common/types/include/AndroidVersionUtil.h
+++ b/common/types/include/AndroidVersionUtil.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_ANDROID_VERSION_UTILS_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_ANDROID_VERSION_UTILS_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_ANDROID_VERSION_UTILS_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_ANDROID_VERSION_UTILS_H
#ifdef __ANDROID__
#include <android/api-level.h>
@@ -23,4 +23,4 @@
#define __NNAPI_AIDL_MIN_ANDROID_API__ __ANDROID_API_S__
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_ANDROID_VERSION_UTILS_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_ANDROID_VERSION_UTILS_H
diff --git a/common/types/include/ControlFlow.h b/common/types/include/ControlFlow.h
index a0e9fa8..aea8637 100644
--- a/common/types/include/ControlFlow.h
+++ b/common/types/include/ControlFlow.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_CONTROLFLOW_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_CONTROLFLOW_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_CONTROLFLOW_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_CONTROLFLOW_H
#include <chrono>
#include <cstdint>
@@ -49,4 +49,4 @@
} // namespace nn
} // namespace android
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_CONTROLFLOW_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_CONTROLFLOW_H
diff --git a/common/types/include/Tracing.h b/common/types/include/Tracing.h
index 5d0b63a..3de323e 100644
--- a/common/types/include/Tracing.h
+++ b/common/types/include/Tracing.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TRACING_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TRACING_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_TRACING_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_TRACING_H
#ifndef NN_COMPATIBILITY_LIBRARY_BUILD
#define ATRACE_TAG ATRACE_TAG_NNAPI
@@ -178,4 +178,4 @@
#undef ATRACE_NAME
#undef ATRACE_CALL
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TRACING_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_TRACING_H
diff --git a/common/types/include/nnapi/IBuffer.h b/common/types/include/nnapi/IBuffer.h
index 3d3bc58..3d6bbc8 100644
--- a/common/types/include/nnapi/IBuffer.h
+++ b/common/types/include/nnapi/IBuffer.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IBUFFER_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IBUFFER_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IBUFFER_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IBUFFER_H
#include "nnapi/Result.h"
#include "nnapi/Types.h"
@@ -76,4 +76,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IBUFFER_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IBUFFER_H
diff --git a/common/types/include/nnapi/IBurst.h b/common/types/include/nnapi/IBurst.h
index ca5e0b5..ca45cce 100644
--- a/common/types/include/nnapi/IBurst.h
+++ b/common/types/include/nnapi/IBurst.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IBURST_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IBURST_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IBURST_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IBURST_H
#include <android-base/scopeguard.h>
@@ -164,4 +164,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IBURST_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IBURST_H
diff --git a/common/types/include/nnapi/IDevice.h b/common/types/include/nnapi/IDevice.h
index 971b155..3d52837 100644
--- a/common/types/include/nnapi/IDevice.h
+++ b/common/types/include/nnapi/IDevice.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IDEVICE_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IDEVICE_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IDEVICE_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IDEVICE_H
#include <memory>
#include <string>
@@ -372,4 +372,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IDEVICE_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IDEVICE_H
diff --git a/common/types/include/nnapi/IExecution.h b/common/types/include/nnapi/IExecution.h
index ab9e59c..f8c45f1 100644
--- a/common/types/include/nnapi/IExecution.h
+++ b/common/types/include/nnapi/IExecution.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IEXECUTION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IEXECUTION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IEXECUTION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IEXECUTION_H
#include <utility>
#include <vector>
@@ -164,4 +164,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IEXECUTION_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IEXECUTION_H
diff --git a/common/types/include/nnapi/IPreparedModel.h b/common/types/include/nnapi/IPreparedModel.h
index 70bad9c..53bfb8e 100644
--- a/common/types/include/nnapi/IPreparedModel.h
+++ b/common/types/include/nnapi/IPreparedModel.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IPREPARED_MODEL_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IPREPARED_MODEL_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IPREPARED_MODEL_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IPREPARED_MODEL_H
#include <any>
#include <functional>
@@ -222,4 +222,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_IPREPARED_MODEL_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_IPREPARED_MODEL_H
diff --git a/common/types/include/nnapi/OperandTypes.h b/common/types/include/nnapi/OperandTypes.h
index 75da7ad..36b429b 100644
--- a/common/types/include/nnapi/OperandTypes.h
+++ b/common/types/include/nnapi/OperandTypes.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERAND_TYPES_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERAND_TYPES_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERAND_TYPES_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERAND_TYPES_H
namespace android::nn {
@@ -182,4 +182,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERAND_TYPES_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERAND_TYPES_H
diff --git a/common/types/include/nnapi/OperationTypes.h b/common/types/include/nnapi/OperationTypes.h
index a0405b2..f69d55d 100644
--- a/common/types/include/nnapi/OperationTypes.h
+++ b/common/types/include/nnapi/OperationTypes.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERATION_TYPES_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERATION_TYPES_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERATION_TYPES_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERATION_TYPES_H
namespace android::nn {
@@ -5495,4 +5495,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERATION_TYPES_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERATION_TYPES_H
diff --git a/common/types/include/nnapi/Result.h b/common/types/include/nnapi/Result.h
index 91f4439..698ab70 100644
--- a/common/types/include/nnapi/Result.h
+++ b/common/types/include/nnapi/Result.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_RESULT_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_RESULT_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_RESULT_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_RESULT_H
#include <android-base/expected.h>
@@ -155,4 +155,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_RESULT_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_RESULT_H
diff --git a/common/types/include/nnapi/SharedMemory.h b/common/types/include/nnapi/SharedMemory.h
index bd0d220..173a210 100644
--- a/common/types/include/nnapi/SharedMemory.h
+++ b/common/types/include/nnapi/SharedMemory.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_SHARED_MEMORY_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_SHARED_MEMORY_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_SHARED_MEMORY_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_SHARED_MEMORY_H
#include <android-base/unique_fd.h>
@@ -189,4 +189,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_SHARED_MEMORY_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_SHARED_MEMORY_H
diff --git a/common/types/include/nnapi/TypeUtils.h b/common/types/include/nnapi/TypeUtils.h
index e26396a..87e7c3f 100644
--- a/common/types/include/nnapi/TypeUtils.h
+++ b/common/types/include/nnapi/TypeUtils.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPE_UTILS_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPE_UTILS_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPE_UTILS_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPE_UTILS_H
#include <android-base/expected.h>
#include <android-base/logging.h>
@@ -297,4 +297,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPE_UTILS_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPE_UTILS_H
diff --git a/common/types/include/nnapi/Types.h b/common/types/include/nnapi/Types.h
index ce81e8b..dbe7130 100644
--- a/common/types/include/nnapi/Types.h
+++ b/common/types/include/nnapi/Types.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPES_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPES_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPES_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPES_H
#include <android-base/chrono_utils.h>
#include <android-base/expected.h>
@@ -1076,4 +1076,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPES_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPES_H
diff --git a/common/types/include/nnapi/Validation.h b/common/types/include/nnapi/Validation.h
index a4d8185..d4d6683 100644
--- a/common/types/include/nnapi/Validation.h
+++ b/common/types/include/nnapi/Validation.h
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_VALIDATION_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_VALIDATION_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_VALIDATION_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_VALIDATION_H
#include <memory>
#include <set>
@@ -147,4 +147,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_VALIDATION_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_VALIDATION_H
diff --git a/tools/api/OperandTypes.t b/tools/api/OperandTypes.t
index 6f9b286..cf3f95b 100644
--- a/tools/api/OperandTypes.t
+++ b/tools/api/OperandTypes.t
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERAND_TYPES_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERAND_TYPES_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERAND_TYPES_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERAND_TYPES_H
namespace android::nn {
@@ -55,4 +55,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERAND_TYPES_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERAND_TYPES_H
diff --git a/tools/api/OperationTypes.t b/tools/api/OperationTypes.t
index f8e0274..13e7b8e 100644
--- a/tools/api/OperationTypes.t
+++ b/tools/api/OperationTypes.t
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERATION_TYPES_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERATION_TYPES_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERATION_TYPES_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERATION_TYPES_H
namespace android::nn {
@@ -136,4 +136,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_OPERATION_TYPES_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_OPERATION_TYPES_H
diff --git a/tools/api/Types.t b/tools/api/Types.t
index 13c1854..8a30f34 100644
--- a/tools/api/Types.t
+++ b/tools/api/Types.t
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPES_H
-#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPES_H
+#ifndef ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPES_H
+#define ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPES_H
#include <android-base/chrono_utils.h>
#include <android-base/expected.h>
@@ -322,4 +322,4 @@
} // namespace android::nn
-#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_NNAPI_TYPES_H
+#endif // ANDROID_PACKAGES_MODULES_NEURALNETWORKS_COMMON_TYPES_NNAPI_TYPES_H
