From bd98a9f6c0f5f2e48953c67c86ddd5e82ed6d74e Mon Sep 17 00:00:00 2001 From: David Gross Date: Tue, 30 Jul 2019 12:53:58 -0700 Subject: Fix names of #include guard symbols. Subsequent discussion recommended "ANDROID_" prefix. Pattern: ANDROID_FRAMEWORKS_ML_${RELPATH}_H, where ${RELPATH} is relative to frameworks/ml, with "include" path component (if any) removed, everything in caps, and word breaks indicated by underscores (rather than by upper case). This is derived from our current practices in frameworks/ml. Generate name: ANDROID_FRAMEWORKS_ML_$(echo ${RELPATH} | sed -e 's!/include!!g' -e 's![/.]!_!g' -e 's!\([^_A-Z]\)\([A-Z]\)!\1_\2!g' | awk '{ print toupper($1); }') Bug: 129138718 Test: cd frameworks/ml ; mma Change-Id: Ida001ba3767e8a6984e47b3570c69b1ba91f8bd4 Merged-In: Ida001ba3767e8a6984e47b3570c69b1ba91f8bd4 --- nn/common/include/MetaModel.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nn/common/include/MetaModel.h') diff --git a/nn/common/include/MetaModel.h b/nn/common/include/MetaModel.h index 2f9a1b1d3..89aee9f0b 100644 --- a/nn/common/include/MetaModel.h +++ b/nn/common/include/MetaModel.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef FRAMEWORKS_ML_NN_COMMON_META_MODEL_H -#define FRAMEWORKS_ML_NN_COMMON_META_MODEL_H +#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H +#define ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H #include "HalInterfaces.h" @@ -140,4 +140,4 @@ class MetaModel { } // namespace android::nn -#endif // FRAMEWORKS_ML_NN_COMMON_META_MODEL_H +#endif // ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H -- cgit v1.2.3