diff --git a/app/productFlavors/fMultiDisplayOchBus.gradle b/app/productFlavors/fMultiDisplayOchBus.gradle index 43fff66de1..9736b06986 100644 --- a/app/productFlavors/fMultiDisplayOchBus.gradle +++ b/app/productFlavors/fMultiDisplayOchBus.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fMultiDisplayOchTaxi.gradle b/app/productFlavors/fMultiDisplayOchTaxi.gradle index 7c95db8fd3..8c26dd60ca 100644 --- a/app/productFlavors/fMultiDisplayOchTaxi.gradle +++ b/app/productFlavors/fMultiDisplayOchTaxi.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fMultiDisplaySweeper.gradle b/app/productFlavors/fMultiDisplaySweeper.gradle index fbfd08b1e7..912b83cc7c 100644 --- a/app/productFlavors/fMultiDisplaySweeper.gradle +++ b/app/productFlavors/fMultiDisplaySweeper.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovo.gradle b/app/productFlavors/fPadLenovo.gradle index 245ff86dca..bc5a33d4d4 100644 --- a/app/productFlavors/fPadLenovo.gradle +++ b/app/productFlavors/fPadLenovo.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchBus.gradle b/app/productFlavors/fPadLenovoOchBus.gradle index f7338b4090..199094c23e 100644 --- a/app/productFlavors/fPadLenovoOchBus.gradle +++ b/app/productFlavors/fPadLenovoOchBus.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchBusPassenger.gradle b/app/productFlavors/fPadLenovoOchBusPassenger.gradle index aa50f49580..124a4f8f43 100644 --- a/app/productFlavors/fPadLenovoOchBusPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchBusPassenger.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchSweeper.gradle b/app/productFlavors/fPadLenovoOchSweeper.gradle index 54d673fcdc..8b4a76dfff 100644 --- a/app/productFlavors/fPadLenovoOchSweeper.gradle +++ b/app/productFlavors/fPadLenovoOchSweeper.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchTaxi.gradle b/app/productFlavors/fPadLenovoOchTaxi.gradle index ebeac659c3..a9662f22eb 100644 --- a/app/productFlavors/fPadLenovoOchTaxi.gradle +++ b/app/productFlavors/fPadLenovoOchTaxi.gradle @@ -5,7 +5,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle index 5c37382209..5d9df2f4d4 100644 --- a/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle +++ b/app/productFlavors/fPadLenovoOchTaxiPassenger.gradle @@ -4,7 +4,7 @@ project.android.productFlavors { externalNativeBuild { ndk { // 设置支持的SO库架构 - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo diff --git a/app_ipc_monitoring/build.gradle b/app_ipc_monitoring/build.gradle index d52b8fbaea..ce5118ccdd 100644 --- a/app_ipc_monitoring/build.gradle +++ b/app_ipc_monitoring/build.gradle @@ -32,7 +32,7 @@ android { } externalNativeBuild { ndk { - abiFilters 'armeabi-v7a', 'arm64-v8a' + abiFilters 'armeabi-v7a'//, 'arm64-v8a' } } } diff --git a/app_mogo_magic_ring/build.gradle b/app_mogo_magic_ring/build.gradle index 44f73d10b3..6836a13e5b 100644 --- a/app_mogo_magic_ring/build.gradle +++ b/app_mogo_magic_ring/build.gradle @@ -20,7 +20,7 @@ android { } externalNativeBuild { ndk { - abiFilters 'armeabi-v7a', 'arm64-v8a' + abiFilters 'armeabi-v7a'//, 'arm64-v8a' } } } diff --git a/core/function-impl/mogo-core-function-chat/build.gradle b/core/function-impl/mogo-core-function-chat/build.gradle index af1385fc7d..6b25a6ac71 100644 --- a/core/function-impl/mogo-core-function-chat/build.gradle +++ b/core/function-impl/mogo-core-function-chat/build.gradle @@ -24,7 +24,7 @@ android { } ndk { - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } diff --git a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt b/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt deleted file mode 100644 index 907a96144d..0000000000 --- a/core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/main/VideoAdAtc.kt +++ /dev/null @@ -1,29 +0,0 @@ -package com.mogo.eagle.core.function.main - -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import com.mogo.eagle.core.function.hmi.R -import com.mogo.eagle.core.utilcode.util.BarUtils -import com.mogo.eagle.core.widget.TextureVideoView - -/** - * 视频广告 TODO 测试用的,可删除 - */ -class VideoAdAtc : AppCompatActivity() { - - private lateinit var svpFrame: TextureVideoView - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_video_ad_atc) - - svpFrame = findViewById(R.id.svp_frame) - - val url = "android.resource://" + packageName + "/" + R.raw.mogo_ad - svpFrame.videoPath = url - svpFrame.start() - - BarUtils.hideStatusBarAndSticky(this.window) - } - -} \ No newline at end of file diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/raw/mogo_ad.mp4 b/core/function-impl/mogo-core-function-hmi/src/main/res/raw/mogo_ad.mp4 deleted file mode 100644 index c73fca4389..0000000000 Binary files a/core/function-impl/mogo-core-function-hmi/src/main/res/raw/mogo_ad.mp4 and /dev/null differ diff --git a/libraries/map-usbcamera/build.gradle b/libraries/map-usbcamera/build.gradle index 2616caa0ec..ff0df5dcca 100644 --- a/libraries/map-usbcamera/build.gradle +++ b/libraries/map-usbcamera/build.gradle @@ -27,7 +27,7 @@ android { } ndk { - abiFilters "armeabi-v7a", "arm64-v8a" + abiFilters "armeabi-v7a"//, "arm64-v8a" } } diff --git a/test/crashreport-apmbyte/build.gradle b/test/crashreport-apmbyte/build.gradle index eeab9e0aa8..2ed5c92d20 100644 --- a/test/crashreport-apmbyte/build.gradle +++ b/test/crashreport-apmbyte/build.gradle @@ -18,7 +18,7 @@ android { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' + abiFilters 'armeabi-v7a' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/test/crashreport-noop/build.gradle b/test/crashreport-noop/build.gradle index 1a8e3eadfe..629ce89c60 100644 --- a/test/crashreport-noop/build.gradle +++ b/test/crashreport-noop/build.gradle @@ -18,7 +18,7 @@ android { ndk { // 设置支持的SO库架构 - abiFilters 'armeabi' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' + abiFilters 'armeabi-v7a' //, 'x86', 'armeabi-v7a', 'x86_64', 'arm64-v8a' } testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"