mirror of
https://github.com/ironfox-oss/IronFox.git
synced 2026-04-19 22:47:39 -04:00
53 lines
2.6 KiB
Diff
53 lines
2.6 KiB
Diff
diff --git a/glean-core/android/build.gradle b/glean-core/android/build.gradle
|
|
index d2d114a..7a5bff0 100644
|
|
--- a/glean-core/android/build.gradle
|
|
+++ b/glean-core/android/build.gradle
|
|
@@ -199,7 +199,7 @@ def generateUniffiBindings = tasks.register("generateUniffiBindings") {
|
|
doFirst {
|
|
exec {
|
|
workingDir project.rootDir
|
|
- commandLine 'cargo', 'uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', UNIFFI_OUT_DIR.get()
|
|
+ commandLine '{uniffi}/uniffi-bindgen', 'generate', '--no-format', "${project.projectDir}/${udlFilePath}", '--language', 'kotlin', '--out-dir', UNIFFI_OUT_DIR.get(), '--config', "${project.projectDir}/../uniffi.toml", '--lib-file', "${project.rootDir}/target/{libxul_dir}/libxul.so", '--crate', 'glean_core'
|
|
}
|
|
}
|
|
outputs.dir UNIFFI_OUT_DIR
|
|
diff --git a/glean-core/android/proguard-rules-consumer.pro b/glean-core/android/proguard-rules-consumer.pro
|
|
index 0ca6fc7..e365179 100644
|
|
--- a/glean-core/android/proguard-rules-consumer.pro
|
|
+++ b/glean-core/android/proguard-rules-consumer.pro
|
|
@@ -2,15 +2,15 @@
|
|
|
|
# JNA specific rules
|
|
# See https://github.com/java-native-access/jna/blob/master/www/FrequentlyAskedQuestions.md#jna-on-android
|
|
--dontwarn java.awt.*
|
|
--keep class com.sun.jna.* { *; }
|
|
--keepclassmembers class * extends com.sun.jna.* { public *; }
|
|
+#-dontwarn java.awt.*
|
|
+#-keep class com.sun.jna.* { *; }
|
|
+#-keepclassmembers class * extends com.sun.jna.* { public *; }
|
|
|
|
# Glean specific rules
|
|
--keep class mozilla.telemetry.** { *; }
|
|
+#-keep class mozilla.telemetry.** { *; }
|
|
|
|
# The Glean SDK ships with classes used for tests as well. They are disabled
|
|
# and not directly usable in production code: they throw if used there. They
|
|
# can be used in tests just fine but, outside of tests, the test dependency
|
|
# they use won't be there, hence the warning. It's safe to suppress these.
|
|
--dontwarn mozilla.telemetry.glean.testing.**
|
|
+#-dontwarn mozilla.telemetry.glean.testing.**
|
|
diff --git a/glean-core/android-native/proguard-rules-consumer.pro b/glean-core/android-native/proguard-rules-consumer.pro
|
|
index 53519d424..855cad12e 100644
|
|
--- a/glean-core/android-native/proguard-rules-consumer.pro
|
|
+++ b/glean-core/android-native/proguard-rules-consumer.pro
|
|
@@ -2,6 +2,6 @@
|
|
|
|
# JNA specific rules
|
|
# See https://github.com/java-native-access/jna/blob/master/www/FrequentlyAskedQuestions.md#jna-on-android
|
|
--dontwarn java.awt.*
|
|
--keep class com.sun.jna.* { *; }
|
|
--keepclassmembers class * extends com.sun.jna.* { public *; }
|
|
+#-dontwarn java.awt.*
|
|
+#-keep class com.sun.jna.* { *; }
|
|
+#-keepclassmembers class * extends com.sun.jna.* { public *; }
|