diff options
| author | Przemysław Szczepaniak <pszczepaniak@google.com> | 2021-07-19 16:33:36 +0100 |
|---|---|---|
| committer | Przemyslaw Szczepaniak <pszczepaniak@google.com> | 2021-07-19 15:47:03 +0000 |
| commit | f0072da8f29c78ddc38c916df9d81c318b487e86 (patch) | |
| tree | 160579e53c14239691bb8b52af64a754be242764 | |
| parent | b98434192a7d0e0fbe1834775531b5331e7768b7 (diff) | |
| download | NeuralNetworks-f0072da8f29c78ddc38c916df9d81c318b487e86.tar.gz | |
Replace FUTURE with S level in NNAPI headers.
S level has been defined, __builtin_available should use
S level instead of "future" level.
Already done in other parts of NNAPI codebase, two
usages need to be fixed
Test: Build image
Bug: 193935923
Change-Id: Ia17e3f43e4293f2149e14eab634153cc850ce62d
| -rw-r--r-- | runtime/include/NeuralNetworks.h | 5 | ||||
| -rw-r--r-- | shim_and_sl/include/SupportLibrary.h | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/runtime/include/NeuralNetworks.h b/runtime/include/NeuralNetworks.h index 446d99b61..a6a10d0d0 100644 --- a/runtime/include/NeuralNetworks.h +++ b/runtime/include/NeuralNetworks.h @@ -59,11 +59,8 @@ #define __NNAPI_INTRODUCED_IN(x) __INTRODUCED_IN(x) #endif -// TODO: replace __ANDROID_API_FUTURE__with 31 when it's official (b/178144708) -// This is required for __builtin_available guards around functionality -// introduced in FL5/API31. #ifndef __NNAPI_FL5_MIN_ANDROID_API__ -#define __NNAPI_FL5_MIN_ANDROID_API__ __ANDROID_API_FUTURE__ +#define __NNAPI_FL5_MIN_ANDROID_API__ __ANDROID_API_S__ #endif __BEGIN_DECLS diff --git a/shim_and_sl/include/SupportLibrary.h b/shim_and_sl/include/SupportLibrary.h index be5955cd4..eae98b1fe 100644 --- a/shim_and_sl/include/SupportLibrary.h +++ b/shim_and_sl/include/SupportLibrary.h @@ -23,11 +23,8 @@ #include "NeuralNetworksSupportLibraryImpl.h" #include "NeuralNetworksTypes.h" -// TODO: replace __ANDROID_API_FUTURE__with 31 when it's official (b/178144708) -// This is required for __builtin_available guards around functionality -// introduced in FL5/API31. #ifndef __NNAPI_FL5_MIN_ANDROID_API__ -#define __NNAPI_FL5_MIN_ANDROID_API__ __ANDROID_API_FUTURE__ +#define __NNAPI_FL5_MIN_ANDROID_API__ __ANDROID_API_S__ #endif /** |