Android zoom fixes

pull/192/head
haroon amjad 1 month ago
parent b75f0c7ee4
commit f5aa12a04b

@ -18,22 +18,33 @@ if (keystorePropertiesFile.exists()) {
} }
android { android {
// namespace = "com.ejada.hmg"
namespace = "com.cloudsolutions.HMGPatientApp" namespace = "com.cloudsolutions.HMGPatientApp"
compileSdk = 36 compileSdk = 36
ndkVersion = "28.2.13676358" // Using NDK 26 for better compatibility with Zoom SDK native libraries
ndkVersion = "27.0.12077973"
// ndkVersion = "25.1.8937393"
sourceSets {
getByName("main") {
jniLibs.srcDirs("src/main/jniLibs")
}
}
defaultConfig { defaultConfig {
// applicationId = "com.ejada.hmg"
applicationId = "com.cloudsolutions.HMGPatientApp" applicationId = "com.cloudsolutions.HMGPatientApp"
// minSdk = 24 // minSdk = 24
minSdk = 26 minSdk = 26
targetSdk = 36 targetSdk = 35
compileSdk = 36 compileSdk = 36
// targetSdk = flutter.targetSdkVersion // targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode versionCode = flutter.versionCode
versionName = flutter.versionName versionName = flutter.versionName
multiDexEnabled = true multiDexEnabled = true
// Filter to arm64-v8a for better native library compatibility
ndk {
abiFilters += listOf("arm64-v8a", "armeabi-v7a")
}
} }
buildFeatures { buildFeatures {
@ -84,7 +95,7 @@ android {
} }
} }
packagingOptions { packaging {
jniLibs { jniLibs {
pickFirsts += listOf( pickFirsts += listOf(
"lib/x86/libc++_shared.so", "lib/x86/libc++_shared.so",
@ -94,9 +105,16 @@ android {
"**/*.so" "**/*.so"
) )
useLegacyPackaging = true useLegacyPackaging = true
// Keep Zoom SDK libraries unstripped to preserve symbols
keepDebugSymbols += listOf(
"*/libzoom_util.so",
"*/libzoom_check.so",
"*/libc++_shared.so"
)
} }
resources { resources {
excludes += listOf("META-INF/proguard/androidx-annotations.pro") excludes += listOf("META-INF/proguard/androidx-annotations.pro")
excludes.add("lib/*/libc++_shared.so")
} }
} }
@ -129,9 +147,13 @@ dependencies {
implementation("com.google.code.gson:gson:2.12.0") implementation("com.google.code.gson:gson:2.12.0")
// Zoom SDKs // Zoom SDKs
implementation("us.zoom.videosdk:zoomvideosdk-core:1.12.10") // implementation("us.zoom.videosdk:zoomvideosdk-core:1.12.10")
implementation("us.zoom.videosdk:zoomvideosdk-annotation:1.12.10") // implementation("us.zoom.videosdk:zoomvideosdk-annotation:1.12.10")
implementation("us.zoom.videosdk:zoomvideosdk-videoeffects:1.12.10") // implementation("us.zoom.videosdk:zoomvideosdk-videoeffects:1.12.10")
implementation("us.zoom.videosdk:zoomvideosdk-core:2.1.10")
implementation("us.zoom.videosdk:zoomvideosdk-videoeffects:2.1.10")
implementation("us.zoom.videosdk:zoomvideosdk-annotation:2.1.10")
// Networking // Networking
implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11") implementation("com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.11")
@ -189,5 +211,39 @@ dependencies {
implementation("com.whatsapp.otp:whatsapp-otp-android-sdk:0.1.0") implementation("com.whatsapp.otp:whatsapp-otp-android-sdk:0.1.0")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5") coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
// implementation(project(":vitalSignEngine")) // implementation(project(":vitalSignEngine"))
}
tasks.whenTaskAdded {
if (name.contains("merge") && name.contains("NativeLibs")) {
doLast {
val outputDir = File(project.buildDir, "intermediates/merged_native_libs/release/out/lib")
// Handle both architectures
val abis = listOf("arm64-v8a", "armeabi-v7a")
abis.forEach { abi ->
val targetFile = File(outputDir, "$abi/libc++_shared.so")
val sourceFile = file("src/main/jniLibs/$abi/libc++_shared.so")
if (sourceFile.exists() && targetFile.exists()) {
println("FORCING: Overwriting $abi version with known-good 1.2MB library")
sourceFile.copyTo(targetFile, overwrite = true)
}
}
}
}
} }
//tasks.whenTaskAdded {
// if (name.contains("merge") && name.contains("NativeLibs")) {
// doLast {
// val outputDir = File(project.buildDir, "intermediates/merged_native_libs/release/out/lib")
// val targetFile = File(outputDir, "arm64-v8a/libc++_shared.so")
// val sourceFile = file("src/main/jniLibs/arm64-v8a/libc++_shared.so")
//
// if (sourceFile.exists()) {
// println("FORCE REPLACING: Injecting 1.2MB libc++ into APK...")
// sourceFile.copyTo(targetFile, overwrite = true)
// }
// }
// }
//}

@ -52,6 +52,11 @@
*; *;
} }
# Prevent stripping of standard C++ symbols
-keepclassmembers class * {
native <methods>;
}
-dontwarn com.opentok.android.** -dontwarn com.opentok.android.**
-dontwarn com.opentok.otc.** -dontwarn com.opentok.otc.**

@ -133,6 +133,7 @@
android:screenOrientation="sensorPortrait" android:screenOrientation="sensorPortrait"
android:showOnLockScreen="true" android:showOnLockScreen="true"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
android:extractNativeLibs="true"
tools:replace="android:label"> tools:replace="android:label">
<!-- <activity--> <!-- <activity-->
<!-- android:name="com.cloud.hmg_patient_app.whatsapp.WhatsAppCodeActivity"--> <!-- android:name="com.cloud.hmg_patient_app.whatsapp.WhatsAppCodeActivity"-->

File diff suppressed because one or more lines are too long

@ -90,13 +90,10 @@ dependencies:
location: ^8.0.1 location: ^8.0.1
gms_check: ^1.0.4 gms_check: ^1.0.4
huawei_location: ^6.14.2+301 huawei_location: ^6.14.2+301
huawei_health: ^6.16.0+300 # huawei_health: ^6.16.0+300
intl: ^0.20.2 intl: ^0.20.2
flutter_widget_from_html: ^0.17.1 flutter_widget_from_html: ^0.17.1
huawei_map: huawei_map: ^6.12.0+301
git:
url: https://github.com/fleoparra/hms-flutter-plugin.git
path: flutter-hms-map
scrollable_positioned_list: ^0.3.8 scrollable_positioned_list: ^0.3.8

Loading…
Cancel
Save