Drop support on armv7a on Android

Resolves: COMPMID-5379

Change-Id: Ie2564b8ef029241e34b964de524c4a4c288a7846
Signed-off-by: Michalis Spyrou <michalis.spyrou@arm.com>
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/7735
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez Tello <pablo.tello@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>

4 files changed, 11 insertions, 8 deletions

diff --git a/SConstruct b/SConstruct
index b0b5649a5c..890c51977d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -168,6 +168,10 @@ 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)
+
 if env['linker_script'] and env['os'] != 'bare_metal':
     print("Linker script is only supported for bare_metal builds")
     Exit(1)
diff --git a/docs/user_guide/how_to_build_and_run_examples.dox b/docs/user_guide/how_to_build_and_run_examples.dox
index ed4c6a4029..b1e8513577 100644
--- a/docs/user_guide/how_to_build_and_run_examples.dox
+++ b/docs/user_guide/how_to_build_and_run_examples.dox
@@ -377,7 +377,6 @@ An example build command with SVE is:
 @section S1_3_android Building for Android
 
 For Android, the library was successfully built and tested using Google's standalone toolchains:
- - clang++ from NDK r18b for armv7a
  - clang++ from NDK r20b for armv8a
  - clang++ from NDK r20b for armv8.2-a with FP16 support
 
diff --git a/docs/user_guide/introduction.dox b/docs/user_guide/introduction.dox
index fb483fc134..a727be847e 100644
--- a/docs/user_guide/introduction.dox
+++ b/docs/user_guide/introduction.dox
@@ -59,11 +59,9 @@ Several builds of the library are available using various configurations:
   <td>armv8.2-a-sve
   <td>gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu
 <tr>
-  <td rowspan="3">Android
-  <td>armv7a
-  <td rowspan="3">NDK r18b
-  <tr>
+  <td rowspan="2">Android
   <td>armv8a
+  <td rowspan="2">NDK r18b
   <tr>
   <td>armv8.2-a
 <tr>
@@ -72,14 +70,16 @@ 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>.
 
 In order to facilitate the work of the support team please provide the build information of the library you are using. To get the version of the library you are using simply run:
 
-    $ strings android-armv7a-cl-asserts/libarm_compute.so | grep arm_compute_version
-    arm_compute_version=v16.12 Build options: {'embed_kernels': '1', 'opencl': '1', 'arch': 'armv7a', 'neon': '0', 'asserts': '1', 'debug': '0', 'os': 'android', 'Werror': '1'} Git hash=f51a545d4ea12a9059fe4e598a092f1fd06dc858
+    $ strings android-armv8a-cl-asserts/libarm_compute.so | grep arm_compute_version
+    arm_compute_version=v16.12 Build options: {'embed_kernels': '1', 'opencl': '1', 'arch': 'armv8a', 'neon': '0', 'asserts': '1', 'debug': '0', 'os': 'android', 'Werror': '1'} Git hash=f51a545d4ea12a9059fe4e598a092f1fd06dc858
 
 @section S0_2_prebuilt_binaries Pre-built binaries
 
@@ -91,7 +91,6 @@ These binaries have been built using the following toolchains:
             - Linux armv8.2-a: gcc-linaro-7.2.1-2017.11-x86_64_aarch64-linux-gnu
             - Linux armv8.2-a (multi-ISA binary): gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu
             - Linux armv8.2-a-sve: gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu
-            - Android armv7a: clang++ / libc++ NDK r20b
             - Android armv8a: clang++ / libc++ NDK r20b
             - Android armv8.2-a: clang++ / libc++ NDK r20b
 
diff --git a/docs/user_guide/release_version_and_change_log.dox b/docs/user_guide/release_version_and_change_log.dox
index ac6577bae7..c4b157f0c8 100644
--- a/docs/user_guide/release_version_and_change_log.dox
+++ b/docs/user_guide/release_version_and_change_log.dox
@@ -47,6 +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
 
 v22.05 Public major release
  - Various bug fixes.