From 3c81e145e13b1334ba9ebf0d7864e0c4d7eae350 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Thu, 23 Mar 2023 11:41:03 +0800
Subject: [PATCH] =?UTF-8?q?[shuttle]=20[=E6=B7=BB=E5=8A=A0ndk=E6=9E=B6?=
 =?UTF-8?q?=E6=9E=84]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/productFlavors/fOchShuttle.gradle          |  9 ++++++---
 app/productFlavors/fOchShuttlePassenger.gradle | 14 ++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/productFlavors/fOchShuttle.gradle b/app/productFlavors/fOchShuttle.gradle
index b3290c6685..10af854fc0 100644
--- a/app/productFlavors/fOchShuttle.gradle
+++ b/app/productFlavors/fOchShuttle.gradle
@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-                abiFilters "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -20,8 +20,11 @@ project.android.productFlavors {
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
         //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue, CHANNEL_VALUE: "fOchShuttle",ACTIVITY_ROOT:true,
-                                SCREEN_ORIENTATION: "landscape"]
+        manifestPlaceholders = [
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                CHANNEL_VALUE     : "fOchShuttle", ACTIVITY_ROOT: true,
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否基于地图
         buildConfigField 'boolean', 'IS_MAP_BASED', 'true'
diff --git a/app/productFlavors/fOchShuttlePassenger.gradle b/app/productFlavors/fOchShuttlePassenger.gradle
index 035eef12a3..5f7bfc6a6a 100644
--- a/app/productFlavors/fOchShuttlePassenger.gradle
+++ b/app/productFlavors/fOchShuttlePassenger.gradle
@@ -4,7 +4,7 @@ project.android.productFlavors {
         externalNativeBuild {
             ndk {
                 // 设置支持的SO库架构
-                abiFilters "arm64-v8a"
+                abiFilters "armeabi-v7a", "arm64-v8a"
             }
         }
         minSdkVersion rootProject.ext.android.minSdkVersionPadLenovo
@@ -17,11 +17,13 @@ project.android.productFlavors {
         // 车机类型，主要用于区分自研车机还是别人家的车机，自研车机类型为0
         buildConfigField 'int', 'CAR_MACHINE_TYPE', '2'
         //高德地图鉴权信息
-        manifestPlaceholders = [AMAP_API_VALUE: rootProject.ext.android.fLauncherAmapApiValue,
-                                CHANNEL_VALUE: "fOchShuttlePassenger",
-                                ACTIVITY_ROOT:true,
-                                // Activity的朝向
-                                SCREEN_ORIENTATION: "landscape"]
+        manifestPlaceholders = [
+                AMAP_API_VALUE    : rootProject.ext.android.fLauncherAmapApiValue,
+                CHANNEL_VALUE     : "fOchShuttlePassenger",
+                ACTIVITY_ROOT     : true,
+                // Activity的朝向
+                SCREEN_ORIENTATION: "landscape"
+        ]
 
         // 是否基于地图
         buildConfigField 'boolean', 'IS_MAP_BASED', 'true'