[tor-commits] [Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! Lox integration

[Pier Angelo Vendrame (@pierov)]

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser


Commits:
7d601745 by Pier Angelo Vendrame at 2024-09-05T20:03:33+02:00
fixup! Lox integration

Bug 42607 (part): Do not ship the Lox wasm blob on Android.

- - - - -
e56124b4 by Pier Angelo Vendrame at 2024-09-05T20:03:40+02:00
fixup! Bug 40597: Implement TorSettings module

Bug 42607 (part): Do not try to enable Lox on Android.

Lox is not on Android, yet (not even in alpha), so we removed its WASM
blob to make x86 build fit the play store requirements.
However, this causes an error message in the console, which we do not
need to show because it is completely expected.

- - - - -


2 changed files:

- toolkit/components/lox/jar.mn
- toolkit/modules/TorSettings.sys.mjs


Changes:

=====================================
toolkit/components/lox/jar.mn
=====================================
@@ -1,2 +1,4 @@
 toolkit.jar:
+#ifndef ANDROID
     content/global/lox/lox_wasm_bg.wasm                      (content/lox_wasm_bg.wasm)
+#endif


=====================================
toolkit/modules/TorSettings.sys.mjs
=====================================
@@ -696,10 +696,12 @@ class TorSettingsImpl {
 
     // Initialize this before loading from prefs because we need Lox initialized
     // before any calls to Lox.getBridges().
-    try {
-      await lazy.Lox.init();
-    } catch (e) {
-      lazy.logger.error("Could not initialize Lox.", e);
+    if (!lazy.TorLauncherUtil.isAndroid) {
+      try {
+        await lazy.Lox.init();
+      } catch (e) {
+        lazy.logger.error("Could not initialize Lox.", e);
+      }
     }
 
     if (



View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7c54df4a1581c1789abe8c1083895fd25bf34b81...e56124b42be208bb9d3fc4ee30f7084fda1225ce

-- 
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7c54df4a1581c1789abe8c1083895fd25bf34b81...e56124b42be208bb9d3fc4ee30f7084fda1225ce
You're receiving this email because of your account on gitlab.torproject.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.torproject.org/pipermail/tor-commits/attachments/20240905/288ad72f/attachment-0001.htm>