Fix armv7a on Android "end-of-support" build and documentation

* Only print a warning for this build
* Fix the wording in documentation to avoid misunderstanding. User can
  still run armv7a on Android, but we stop testing it and this build is
  discouraged

Resolves COMPMID-5379

Signed-off-by: SiCong Li <sicong.li@arm.com>
Change-Id: I3d00baa2479671bcef8882db0e3d3cc3043d5811
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7838
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gunes Bayir <gunes.bayir@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

4 files changed, 9 insertions, 8 deletions

diff --git a/README.md b/README.md
index 22602a5737..f780252f15 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 
 > **⚠ Important**
-> From this release (22.05): 'master' branch has been replaced with 'main' following our inclusive language update, more information [here](https://arm-software.github.io/ComputeLibrary/latest/contribution_guidelines.xhtml#S5_0_inc_lang).
+> From release 22.05: 'master' branch has been replaced with 'main' following our inclusive language update, more information [here](https://arm-software.github.io/ComputeLibrary/latest/contribution_guidelines.xhtml#S5_0_inc_lang).
+
+> **⚠ Important**
+> From release 22.08: armv7a with Android build will no longer be tested or maintained.
 
 <br>
 <div align="center">
@@ -57,7 +60,6 @@ All the binaries can be downloaded from [here](https://github.com/ARM-software/C
 
 | Architecture    | Operating System | Release archive (Download) |
 | ----------- | ----------- | ----------- |
-| armv7 | Android | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-android-armv7a-neon.tar.gz) [![](https://img.shields.io/badge/build-opencl-blue)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-android-armv7a-cl.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-android-armv7a-neon-cl.tar.gz) |
 | armv7 | Linux | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-linux-armv7a-neon.tar.gz) [![](https://img.shields.io/badge/build-opencl-blue)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-linux-armv7a-cl.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-linux-armv7a-neon-cl.tar.gz) |
 | arm64-v8a | Android | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-android-arm64-v8a-neon.tar.gz) [![](https://img.shields.io/badge/build-opencl-blue)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-android-arm64-v8a-cl.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-android-arm64-v8a-neon-cl.tar.gz) |
 | arm64-v8a | Linux | [![](https://img.shields.io/badge/build-neon-orange)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-linux-arm64-v8a-neon.tar.gz) [![](https://img.shields.io/badge/build-opencl-blue)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-linux-arm64-v8a-cl.tar.gz) [![](https://img.shields.io/badge/build-neon+cl-yellowgreen)](https://github.com/ARM-software/ComputeLibrary/releases/download/v22.05/arm_compute-v22.05-bin-linux-arm64-v8a-neon-cl.tar.gz) |
diff --git a/SConstruct b/SConstruct
index 890c51977d..be438e05f3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -169,8 +169,7 @@ Export('install_bin')
 Help(vars.GenerateHelpText(env))
 
 if 'armv7a' in env['arch'] and env['os'] == 'android':
-    print("armv7a is not supported on Android")
-    Exit(1)
+    print("WARNING: armv7a on Android is no longer maintained")
 
 if env['linker_script'] and env['os'] != 'bare_metal':
     print("Linker script is only supported for bare_metal builds")
diff --git a/docs/user_guide/introduction.dox b/docs/user_guide/introduction.dox
index a727be847e..7086f86c7c 100644
--- a/docs/user_guide/introduction.dox
+++ b/docs/user_guide/introduction.dox
@@ -39,6 +39,8 @@ Several builds of the library are available using various configurations:
  - Technology: Arm® Neon™ / OpenCL / Arm® Neon™ and OpenCL.
  - Debug / Asserts / Release: Use a build with asserts enabled to debug your application and enable extra validation. Once you are sure your application works as expected you can switch to a release build of the library for maximum performance.
 
+@warning From 22.08 release, armv7a with Android build will no longer be tested or maintained.
+
 @b Minimum toolchains requirements are shown below:
 
 <table>
@@ -70,8 +72,6 @@ Several builds of the library are available using various configurations:
   <td>Monterey (OS version): clang 13 (native)
 </table>
 
-@warning From 22.08 release, armv7a will no longer be supported on Android.
-
 @section S0_1_contact Contact / Support
 
 Please create an issue on <a href="https://github.com/ARM-software/ComputeLibrary/issues">Github</a>.
diff --git a/docs/user_guide/release_version_and_change_log.dox b/docs/user_guide/release_version_and_change_log.dox
index c4b157f0c8..c64f464b4b 100644
--- a/docs/user_guide/release_version_and_change_log.dox
+++ b/docs/user_guide/release_version_and_change_log.dox
@@ -37,7 +37,7 @@ If there is more than one release in a month then an extra sequential number is
 	v17.04 (First release of April 2017)
 
 @note We're aiming at releasing one major public release with new features per quarter. All releases in between will only contain bug fixes.
-@note Starting from this release (22.05), 'master' branch will no longer be used, it has been replaced by 'main'. Please update your clone jobs accordingly.
+@note Starting from release 22.05, 'master' branch will no longer be used, it has been replaced by 'main'. Please update your clone jobs accordingly.
 
 @section S2_2_changelog Changelog
 
@@ -47,7 +47,7 @@ v22.08 Public major release
    - Use "auto" to use default (auto) prefixes chosen by the build script. This is the default behavior when unspecified
    - Any other string will be used as custom prefixes to the compiler and the rest of toolchain tools
    - The default behaviour when prefix is unspecified does not change, but its signifier has been changed from empty string "" to "auto"
-   - armv7a will no longer be supported on Android
+ - armv7a with Android build will no longer be tested or maintained
 
 v22.05 Public major release
  - Various bug fixes.