Remove mips.
We aren't going to support riscv32, so we won't even need to reuse any of this. Test: treehugger Change-Id: I80d6285ecbd0dfdeeb496be39ba63e06cbb30acd
This commit is contained in:
@@ -522,7 +522,7 @@ def GetAbiFromToolchain(toolchain_var, bits):
|
||||
if not toolchain:
|
||||
return None
|
||||
|
||||
toolchain_match = re.search("\/(aarch64|arm|mips|x86)\/", toolchain)
|
||||
toolchain_match = re.search("\/(aarch64|arm|x86)\/", toolchain)
|
||||
if toolchain_match:
|
||||
abi = toolchain_match.group(1)
|
||||
if abi == "aarch64":
|
||||
@@ -530,8 +530,6 @@ def GetAbiFromToolchain(toolchain_var, bits):
|
||||
elif bits == 64:
|
||||
if abi == "x86":
|
||||
return "x86_64"
|
||||
elif abi == "mips":
|
||||
return "mips64"
|
||||
return abi
|
||||
return None
|
||||
|
||||
@@ -600,7 +598,6 @@ class FindToolchainTests(unittest.TestCase):
|
||||
def test_toolchains_found(self):
|
||||
self.assert_toolchain_found("arm")
|
||||
self.assert_toolchain_found("arm64")
|
||||
self.assert_toolchain_found("mips")
|
||||
self.assert_toolchain_found("x86")
|
||||
self.assert_toolchain_found("x86_64")
|
||||
|
||||
@@ -618,11 +615,6 @@ class SetArchTests(unittest.TestCase):
|
||||
SetAbi(["ABI: 'arm64'"])
|
||||
self.assertEqual(ARCH, "arm64")
|
||||
|
||||
SetAbi(["ABI: 'mips'"])
|
||||
self.assertEqual(ARCH, "mips")
|
||||
SetAbi(["ABI: 'mips64'"])
|
||||
self.assertEqual(ARCH, "mips64")
|
||||
|
||||
SetAbi(["ABI: 'x86'"])
|
||||
self.assertEqual(ARCH, "x86")
|
||||
SetAbi(["ABI: 'x86_64'"])
|
||||
@@ -636,11 +628,6 @@ class SetArchTests(unittest.TestCase):
|
||||
SetAbi(["#00 pc 000374e0"])
|
||||
self.assertEqual(ARCH, "arm")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#00 pc 000374e0"])
|
||||
self.assertEqual(ARCH, "mips")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#00 pc 000374e0"])
|
||||
@@ -655,12 +642,6 @@ class SetArchTests(unittest.TestCase):
|
||||
SetAbi(["#00 pc 000374e0"])
|
||||
self.assertEqual(ARCH, "arm")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/mips/mips-linux-androideabi-4.9/bin"
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#00 pc 000374e0"])
|
||||
self.assertEqual(ARCH, "mips")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
||||
@@ -675,11 +656,6 @@ class SetArchTests(unittest.TestCase):
|
||||
SetAbi(["#00 pc 00000000000374e0"])
|
||||
self.assertEqual(ARCH, "arm64")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#00 pc 00000000000374e0"])
|
||||
self.assertEqual(ARCH, "mips64")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#00 pc 00000000000374e0"])
|
||||
@@ -702,11 +678,6 @@ class SetArchTests(unittest.TestCase):
|
||||
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
||||
self.assertEqual(ARCH, "arm")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
||||
self.assertEqual(ARCH, "mips")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#10 0xb5eeba5d (/system/vendor/lib/egl/libGLESv1_CM_adreno.so+0xfa5d)"])
|
||||
@@ -721,12 +692,6 @@ class SetArchTests(unittest.TestCase):
|
||||
SetAbi(["#3 0xae1725b5 (/system/vendor/lib/libllvm-glnext.so+0x6435b5)"])
|
||||
self.assertEqual(ARCH, "arm")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/mips/mips-linux-androideabi-4.9/bin"
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#3 0xae1725b5 (/system/vendor/lib/libllvm-glnext.so+0x6435b5)"])
|
||||
self.assertEqual(ARCH, "mips")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN_2ND_ARCH"] = "linux-x86/x86/x86-linux-androideabi-4.9/bin"
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/unknown/unknown-linux-androideabi-4.9/bin"
|
||||
@@ -741,11 +706,6 @@ class SetArchTests(unittest.TestCase):
|
||||
SetAbi(["#0 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
||||
self.assertEqual(ARCH, "arm64")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/mips/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#1 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
||||
self.assertEqual(ARCH, "mips64")
|
||||
|
||||
os.environ.clear()
|
||||
os.environ["ANDROID_TOOLCHAIN"] = "linux-x86/x86/arm-linux-androideabi-4.9/bin"
|
||||
SetAbi(["#12 0x11b35d33bf (/system/lib/libclang_rt.asan-arm-android.so+0x823bf)"])
|
||||
|
||||
Reference in New Issue
Block a user