Merge branch 'armhf' into 'master'

fix: change the armlinux abi from armeabi-v7a to armhf See merge request deep-computing/mace!1260
XiaoMi · Apr 3, 2020 · 9a06864 · 9a06864
2 parents 7465592 + 3b914cb
commit 9a06864
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tools/common.py b/tools/common.py
@@ -354,12 +354,12 @@ def get_build_model_dirs(library_name,
 
 
 def abi_to_internal(abi):
-    if abi in [ABIType.armeabi_v7a, ABIType.arm64_v8a]:
+    if abi in [ABIType.armeabi_v7a, ABIType.arm64_v8a, ABIType.armhf]:
         return abi
     if abi == ABIType.arm64:
         return ABIType.aarch64
-    if abi == ABIType.armhf:
-        return ABIType.armeabi_v7a
+    else:
+        mace_check(False, "abi not supported")
 
 
 def infer_toolchain(abi):