Extract WebP decoder to an external repo

p1gp1g · Sep 29, 2023 · bfbaae2 · bfbaae2
1 parent ad9e9af
commit bfbaae2
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 171 deletions.
diff --git a/.gitmodules b/.gitmodules
diff --git a/app/build.gradle b/app/build.gradle
@@ -516,6 +516,7 @@ dependencies {
 
     implementation libs.gosimple.nbvcxz
     implementation libs.molly.native.utils
+    implementation libs.molly.glide.webp.decoder
 
     spinnerImplementation project(":spinner")
 

diff --git a/dependencies.gradle b/dependencies.gradle
@@ -120,6 +120,7 @@ dependencyResolutionManagement {
             library('gosimple-nbvcxz', 'me.gosimple:nbvcxz:1.5.0')
             library('molly-native-utils', 'im.molly:native-utils:1.0.0')
             library('molly-argon2', 'im.molly:argon2:13.1-1')
+            library('molly-glide-webp-decoder', 'im.molly:glide-webp-decoder:1.3.2-1')
 
             // Third Party
             library('greenrobot-eventbus', 'org.greenrobot:eventbus:3.0.0')

diff --git a/glide-webp/lib/.gitignore b/glide-webp/lib/.gitignore
diff --git a/glide-webp/lib/build.gradle.kts b/glide-webp/lib/build.gradle.kts
@@ -10,27 +10,12 @@ plugins {
 
 android {
   namespace = "org.signal.glide.webp"
-
-  defaultConfig {
-    externalNativeBuild {
-      cmake {
-        cppFlags("-std=c++17", "-fvisibility=hidden")
-        arguments("-DLIBWEBP_PATH=$rootDir/libwebp")
-      }
-    }
-  }
-
-  externalNativeBuild {
-    cmake {
-      path = file("$projectDir/src/main/cpp/CMakeLists.txt")
-      version = "3.22.1"
-    }
-  }
 }
 
 dependencies {
   implementation(project(":core-util"))
 
   implementation(libs.glide.glide)
+  implementation(libs.molly.glide.webp.decoder)
   kapt(libs.glide.compiler)
 }
diff --git a/glide-webp/lib/src/main/cpp/CMakeLists.txt b/glide-webp/lib/src/main/cpp/CMakeLists.txt
diff --git a/glide-webp/lib/src/main/cpp/signalwebp.cpp b/glide-webp/lib/src/main/cpp/signalwebp.cpp
diff --git a/glide-webp/lib/src/main/java/org/signal/glide/webp/WebpDecoder.kt b/glide-webp/lib/src/main/java/org/signal/glide/webp/WebpDecoder.kt
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -3980,6 +3980,11 @@ https://docs.gradle.org/current/userguide/dependency_verification.html
             <sha256 value="43542ba5be6540faee564f5f532564f062a02aacd76801dce8bdb931aad4d065" origin="Generated by Gradle"/>
          </artifact>
       </component>
+      <component group="im.molly" name="glide-webp-decoder" version="1.3.2-1">
+         <artifact name="glide-webp-decoder-1.3.2-1.aar">
+            <sha256 value="5df9fb5c4ee481abea2ec0d652da5c496e669b9c7845eb6fefe5a205bed3d4d7" origin="Generated by Gradle"/>
+         </artifact>
+      </component>
       <component group="im.molly" name="native-utils" version="1.0.0">
          <artifact name="native-utils-1.0.0.aar">
             <sha256 value="f9076f55b0180c12a6aadd57817963e3b3edb14cc4dc9f0591cd47fb516f9187" origin="Generated by Gradle"/>

diff --git a/libwebp b/libwebp
diff --git a/settings.gradle b/settings.gradle
@@ -36,6 +36,12 @@ dependencyResolutionManagement {
                 includeModule 'im.molly', 'native-utils'
             }
         }
+        maven {
+            url "https://raw.githubusercontent.com/mollyim/maven/master/glide-webp-decoder/releases/"
+            content {
+                includeModule 'im.molly', 'glide-webp-decoder'
+            }
+        }
         maven {
             url "https://dl.cloudsmith.io/qxAgwaeEE1vN8aLU/mobilecoin/mobilecoin/maven/"
         }