From 65f9e617e83abb055885c796c72382ded5b9e26c Mon Sep 17 00:00:00 2001 From: Matthew Date: Tue, 31 Dec 2024 17:58:39 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=A4=9A=E6=B8=A0=E9=81=93=E6=89=93?= =?UTF-8?q?=E5=8C=85"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 43fde7df763cd0b1850553a395e09cad482f9865. --- app/build.gradle | 44 +++++++++++--------------------------------- 1 file changed, 11 insertions(+), 33 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a1642527..96299feb 100644 --- a/app/build.gradle +++ b/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 {