diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 413b8664..5f720457 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip diff --git a/webrtc-android-framework/README.md b/webrtc-android-framework/README.md index d554dbd0..131a1996 100644 --- a/webrtc-android-framework/README.md +++ b/webrtc-android-framework/README.md @@ -22,6 +22,11 @@ rtc_use_h264=true rtc_include_tests=false is_debug=false +# set 16kb Alignment for build +in libWebRTC/src/BUILD.gn set +` +ldflags = ["-Wl,-z,max-page-size=16384"] +` # Java source files that needs to be copied from branch: src/sdk/android/api @@ -37,4 +42,4 @@ build_directory/gen/api/priority_enums.srcjar VideoFrameBufferType.java. It's under gen/sdk/android/video_api_java/generated_java/input_srcjars/org/webrtc -Priority.java and NetworkPreference.java is under gen/sdk/android/peerconnection_java/generated_java/input_srcjars/org/webrtc \ No newline at end of file +Priority.java and NetworkPreference.java is under gen/sdk/android/peerconnection_java/generated_java/input_srcjars/org/webrtc diff --git a/webrtc-android-framework/build.gradle b/webrtc-android-framework/build.gradle index 550c0c13..5fba7123 100644 --- a/webrtc-android-framework/build.gradle +++ b/webrtc-android-framework/build.gradle @@ -55,8 +55,8 @@ tasks.withType(Test) { task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest','createDebugCoverageReport']) { reports { - xml.enabled = true - html.enabled = true + xml.required = true + html.required = true } def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*'] diff --git a/webrtc-android-framework/src/main/jniLibs/arm64-v8a/libjingle_peerconnection_so.so b/webrtc-android-framework/src/main/jniLibs/arm64-v8a/libjingle_peerconnection_so.so index dcf77a0b..f961d744 100644 Binary files a/webrtc-android-framework/src/main/jniLibs/arm64-v8a/libjingle_peerconnection_so.so and b/webrtc-android-framework/src/main/jniLibs/arm64-v8a/libjingle_peerconnection_so.so differ diff --git a/webrtc-android-framework/src/main/jniLibs/armeabi-v7a/libjingle_peerconnection_so.so b/webrtc-android-framework/src/main/jniLibs/armeabi-v7a/libjingle_peerconnection_so.so index 9abe4983..75c03f5d 100644 Binary files a/webrtc-android-framework/src/main/jniLibs/armeabi-v7a/libjingle_peerconnection_so.so and b/webrtc-android-framework/src/main/jniLibs/armeabi-v7a/libjingle_peerconnection_so.so differ diff --git a/webrtc-android-framework/src/main/jniLibs/x86/libjingle_peerconnection_so.so b/webrtc-android-framework/src/main/jniLibs/x86/libjingle_peerconnection_so.so index b12b971c..44d2a0f6 100644 Binary files a/webrtc-android-framework/src/main/jniLibs/x86/libjingle_peerconnection_so.so and b/webrtc-android-framework/src/main/jniLibs/x86/libjingle_peerconnection_so.so differ diff --git a/webrtc-android-framework/src/main/jniLibs/x86_64/libjingle_peerconnection_so.so b/webrtc-android-framework/src/main/jniLibs/x86_64/libjingle_peerconnection_so.so index 90b43448..03e11ff8 100644 Binary files a/webrtc-android-framework/src/main/jniLibs/x86_64/libjingle_peerconnection_so.so and b/webrtc-android-framework/src/main/jniLibs/x86_64/libjingle_peerconnection_so.so differ diff --git a/webrtc-android-sample-app/build.gradle b/webrtc-android-sample-app/build.gradle index af198b60..71c308cc 100644 --- a/webrtc-android-sample-app/build.gradle +++ b/webrtc-android-sample-app/build.gradle @@ -36,6 +36,11 @@ android { pickFirst 'lib/armeabi-v7a/libyuv.so' } */ + packagingOptions { + jniLibs { + useLegacyPackaging = true + } + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 @@ -75,8 +80,8 @@ tasks.withType(Test) { task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest','connectedDebugAndroidTest']) { reports { - xml.enabled = true - html.enabled = true + xml.required = true + html.required = true } def fileFilter = ['**/R.class', '**/R$*.class', '**/BuildConfig.*', '**/Manifest*.*', '**/*Test*.*', 'android/**/*.*']