Backed out changeset 51697f8232c5 (bug 1525999) for causing multiple Android failures on build/target.raptor.tests.tar.gz CLOSED TREES

build/moz.configure/init.configure

@@ -825,7 +825,7 @@ def real_target(value, host, shell, project):
         project = project[0]
     if not value:
         if project == 'mobile/android':
-            return split_triplet('arm-unknown-linux-androideabi')
+            return split_triplet('armv7a-unknown-linux-androideabi')
         return host
     # If --target was only given a cpu arch, expand it with the
     # non-cpu part of the host. For mobile/android, expand it with

python/mozbuild/mozbuild/test/configure/test_moz_configure.py

@@ -107,7 +107,7 @@ class TestTargetAndroid(TargetTest):
     def test_target(self):
         self.assertEqual(
             self.get_target(['--enable-project=mobile/android']),
-            'arm-unknown-linux-androideabi')
+            'armv7a-unknown-linux-androideabi')
         self.assertEqual(
             self.get_target(['--enable-project=mobile/android', '--target=i686']),
             'i686-unknown-linux-android')