revert common.so changes

mapbox · Feb 23, 2022 · 181cc5f · 181cc5f
1 parent c1fd340
commit 181cc5f
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -45,7 +45,7 @@ mapView.location2.puckBearingEnabled = false
 * Fix shimmering artifact when pitched raster tiles with compressed textures are rendered. ([#1160](https://github.com/mapbox/mapbox-maps-android/pull/1160))
 
 ## Dependencies
-* Bump gl-native to 10.4.0-beta.1, mapbox-common to v21.2.0-beta.1 ([#1160](https://github.com/mapbox/mapbox-maps-android/pull/1160))
+* Bump gl-native to 10.4.0-beta.2, mapbox-common to v21.2.0-beta.1 ([#1160](https://github.com/mapbox/mapbox-maps-android/pull/1160), [#1175](https://github.com/mapbox/mapbox-maps-android/pull/1175))
 * Update android gradle plugin to v7.0.4, gradle version to v7.0.2, Gradle licence plugin to 0.8.80, Kotlin gradle plugin to 1.5.31, Jacoco to 0.8.7. ([#1118](https://github.com/mapbox/mapbox-maps-android/pull/1118))
 
 # 10.3.0 February 10, 2022

diff --git a/android-auto-app/build.gradle.kts b/android-auto-app/build.gradle.kts
@@ -35,7 +35,6 @@ android {
     if (buildFromSource.toBoolean()) {
       jniLibs.pickFirsts.add("**/libc++_shared.so")
     }
-    jniLibs.pickFirsts.add("**/libmapbox-common.so")
   }
 }
 

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -58,7 +58,6 @@ android {
       if (buildFromSource.toBoolean()) {
         jniLibs.pickFirsts.add("**/libc++_shared.so")
       }
-      jniLibs.pickFirsts.add("**/libmapbox-common.so")
     }
   }
 

diff --git a/extension-style-app/build.gradle.kts b/extension-style-app/build.gradle.kts
@@ -35,7 +35,6 @@ android {
     if (buildFromSource.toBoolean()) {
       jniLibs.pickFirsts.add("**/libc++_shared.so")
     }
-    jniLibs.pickFirsts.add("**/libmapbox-common.so")
   }
 }
 

diff --git a/sdk/build.gradle.kts b/sdk/build.gradle.kts
@@ -38,9 +38,6 @@ android {
       targetCompatibility = JavaVersion.VERSION_1_8
     }
   }
-  packagingOptions {
-    jniLibs.pickFirsts.add("**/libmapbox-common.so")
-  }
   sourceSets {
     // limit amount of exposed library resources
     getByName("main").res.srcDirs("src/main/res-public")