From 1311774b7c71fe94016a7b2cdf508e3d39114422 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 12 四月 2024 09:46:06 +0800
Subject: [PATCH] Merge branch 'dev-hxb' into wjc_new
---
app/build.gradle | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 0132905..d53f677 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,14 +28,14 @@
defaultConfig {
applicationId "com.hdl.photovoltaic"
minSdk 23
- targetSdk 30
+ targetSdk 28
versionCode 1
versionName "1.3.2"//鐗堟湰瑙勫垯1.3鏄骇鍝佸姛鑳借凯浠ｇ敤鐨�,鏈�鍚庝竴浣�0鏄垜浠慨澶峛ug鐢ㄧ殑
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
manifestPlaceholders = mfph
ndk {
- abiFilters 'x86', 'armeabi-v7a', "arm64-v8a" //涓嶆敮鎸乤rmeabi
+ abiFilters 'armeabi-v7a', "arm64-v8a" //涓嶆敮鎸乤rmeabi
}
manifestPlaceholders = [
@@ -62,6 +62,10 @@
]
}
+ // 淇濊瘉鍏朵粬鐨刲ib娌℃湁琚玴reDex
+ dexOptions {
+ preDexLibraries = false
+ }
repositories {
flatDir {
dirs 'libs'
--
Gitblit v1.8.0