Revert "多渠道打包"

This reverts commit 43fde7df76.

app/build.gradle

@@ -39,7 +39,17 @@ android {
         buildConfigField "long","BUILD_TIMESTAMP", System.currentTimeMillis() + "L"
 
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
-
+        externalNativeBuild {
+            cmake {
+                // cppFlags '-std=c++17 -frtti -fexceptions -Wno-error=format-security'
+                cppFlags '-std=c++17 -fexceptions -Wno-error=format-security -fopenmp'
+                // cppFlags '-std=c++17 -Wno-error=format-security'
+                // arguments "-DANDROID_STL=c++_shared"
+                arguments "-DNCNN_DISABLE_EXCEPTION=OFF", "-DTERM_CORE_ROOT=" + coreroot, "-DOpenCV_DIR=" + opencvsdk + "/sdk/native/jni", "-DHDRPLUS_ROOT=" + hdrplusroot, "-DNCNN_ROOT=" + ncnnroot, "-DHALIDE_ROOT=" + halideroot
+                abiFilters 'arm64-v8a', 'armeabi-v7a'
+                // setAbiFilters(['arm64-v8a'])
+            }
+        }
     }
 
     buildTypes {
@@ -117,38 +127,6 @@ android {
         }
 
     }
-
-    flavorDimensions "version"
-    productFlavors {
-        N938 {
-            dimension "version"
-            externalNativeBuild {
-                cmake {
-                    // cppFlags '-std=c++17 -frtti -fexceptions -Wno-error=format-security'
-                    cppFlags '-std=c++17 -fexceptions -Wno-error=format-security -fopenmp'
-                    // cppFlags '-std=c++17 -Wno-error=format-security'
-                    // arguments "-DANDROID_STL=c++_shared"
-                    arguments "-DNCNN_DISABLE_EXCEPTION=OFF", "-DTERM_CORE_ROOT=" + coreroot, "-DOpenCV_DIR=" + opencvsdk + "/sdk/native/jni", "-DHDRPLUS_ROOT=" + hdrplusroot, "-DNCNN_ROOT=" + ncnnroot, "-DHALIDE_ROOT=" + halideroot
-                    abiFilters 'arm64-v8a', 'armeabi-v7a'
-                    // setAbiFilters(['arm64-v8a'])
-                }
-            }
-        }
-        weipai {
-            dimension "version"
-            externalNativeBuild {
-                cmake {
-                    // cppFlags '-std=c++17 -frtti -fexceptions -Wno-error=format-security'
-                    cppFlags '-std=c++17 -fexceptions -Wno-error=format-security -fopenmp'
-                    // cppFlags '-std=c++17 -Wno-error=format-security'
-                    // arguments "-DANDROID_STL=c++_shared"
-                    arguments "-DNCNN_DISABLE_EXCEPTION=OFF", "-DTERM_CORE_ROOT=" + coreroot, "-DOpenCV_DIR=" + opencvsdk + "/sdk/native/jni", "-DHDRPLUS_ROOT=" + hdrplusroot, "-DNCNN_ROOT=" + ncnnroot, "-DHALIDE_ROOT=" + halideroot
-                    abiFilters 'arm64-v8a', 'armeabi-v7a'
-                    // setAbiFilters(['arm64-v8a'])
-                }
-            }
-        }
-    }
 }
 
 dependencies {