From 0977e41ea440ff6fe5616a0f500eb6980d6aa214 Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 17 Jun 2016 18:26:09 +0200
Subject: [PATCH] Use the armv7 architecture to list the features with
 prepare.py.

---
 prepare.py               | 3 +++
 submodules/cmake-builder | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/prepare.py b/prepare.py
index 4774b0a4f..d7954705b 100755
--- a/prepare.py
+++ b/prepare.py
@@ -110,6 +110,9 @@ class AndroidPreparator(prepare.Preparator):
             self.additional_args += ["-DENABLE_VPX=YES"]
             # self.additional_args += ["-DENABLE_X264=YES"] # Do not activate x264 because it has text relocation issues
 
+    def list_feature_target(self):
+        return android_targets['armv7']
+
     def clean(self):
         prepare.Preparator.clean(self)
         if os.path.isfile('Makefile'):
diff --git a/submodules/cmake-builder b/submodules/cmake-builder
index e53fb56ca..0a9a7741c 160000
--- a/submodules/cmake-builder
+++ b/submodules/cmake-builder
@@ -1 +1 @@
-Subproject commit e53fb56ca9ecc2477fc0c8bb482bf86564a464f0
+Subproject commit 0a9a7741ce9a81ced5e7b8cf9caa61e43af83bcf