Add ohttp support to the Android megazord

Upgrading `ohttp` to the latest version, which is needed to make the
builds work.

Author: bendk

Cargo.lock

@@ -14,16 +14,8 @@ uniffi = { version = "0.29.0" }
 thiserror = "2"
 parking_lot = "0.12"
 rusqlite = { version = "0.37.0", features = ["bundled"] }
-
-[dependencies.bhttp]
-git = "https://github.com/martinthomson/ohttp.git"
-rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
-
-[dependencies.ohttp]
-default-features = false
-git = "https://github.com/martinthomson/ohttp.git"
-rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b"
-features = ["client", "server", "app-svc", "external-sqlite"]
+bhttp = "0.7.1"
+ohttp = { version = "0.7.1", default-features = false, features = ["client", "server", "app-svc", "external-sqlite"] }
 
 [build-dependencies]
 uniffi = { version = "0.29.0", features=["build"]}

components/as-ohttp-client/Cargo.toml

@@ -24,8 +24,8 @@ thiserror = "2"
 uniffi = { version = "0.29.0" }
 tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
 hyper = { version = "0.14", features = ["client", "http1", "http2", "tcp"], optional = true }
-bhttp = { git = "https://github.com/martinthomson/ohttp.git", rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b", optional = true }
-ohttp = { git = "https://github.com/martinthomson/ohttp.git", rev = "bf6a983845cc0b540effb3a615e92d914dfcfd0b", features = ["client", "server", "app-svc", "external-sqlite"], default-features = false, optional = true }
+bhttp = { version = "0.7.1", optional = true }
+ohttp = { version = "0.7.1", features = ["client", "server", "app-svc", "external-sqlite"], default-features = false, optional = true }
 
 [features]
 default = []

components/viaduct/Cargo.toml

@@ -19,8 +19,7 @@ places = { path = "../../components/places" }
 push = { path = "../../components/push" }
 remote_settings = { path = "../../components/remote_settings" }
 rust-log-forwarder = { path = "../../components/support/rust-log-forwarder" }
-# disable ohttp for now until a fix is in for Android; add "features = ["ohttp"]" for enabling ohttp for viaduct
-viaduct = { path = "../../components/viaduct" }
+viaduct = { path = "../../components/viaduct", features = ["ohttp"] }
 nimbus-sdk = { path = "../../components/nimbus" }
 autofill = { path = "../../components/autofill" }
 crashtest = { path = "../../components/crashtest" }

megazords/full/Cargo.toml

@@ -28,8 +28,10 @@ the details of which are reproduced below.
 * [MIT License: tracing, tracing-attributes, tracing-core, tracing-subscriber](#mit-license-tracing-tracing-attributes-tracing-core-tracing-subscriber)
 * [MIT License: weedle2](#mit-license-weedle2)
 * [CC0-1.0 License: base16](#cc0-10-license-base16)
+* [ISC License: libloading](#isc-license-libloading)
 * [ISC License: ring](#isc-license-ring)
 * [BSD-2-Clause License: arrayref](#bsd-2-clause-license-arrayref)
+* [BSD-3-Clause License: bindgen](#bsd-3-clause-license-bindgen)
 * [BSD-3-Clause License: protobuf](#bsd-3-clause-license-protobuf)
 * [Zlib License: foldhash](#zlib-license-foldhash)
 * [Unicode-3.0 License: icu_casemap, icu_casemap_data, icu_collections, icu_locale, icu_locale_core, icu_locale_data, icu_normalizer, icu_normalizer_data, icu_properties, icu_properties_data, icu_provider, icu_segmenter, icu_segmenter_data, litemap, potential_utf, tinystr, writeable, yoke, yoke-derive, zerofrom, zerofrom-derive, zerotrie, zerovec, zerovec-derive](#unicode-30-license-icu_casemap-icu_casemap_data-icu_collections-icu_locale-icu_locale_core-icu_locale_data-icu_normalizer-icu_normalizer_data-icu_properties-icu_properties_data-icu_provider-icu_segmenter-icu_segmenter_data-litemap-potential_utf-tinystr-writeable-yoke-yoke-derive-zerofrom-zerofrom-derive-zerotrie-zerovec-zerovec-derive)
@@ -445,13 +447,16 @@ The following text applies to code linked from these dependencies:
 [autocfg](https://github.com/cuviper/autocfg),
 [base64](https://github.com/marshallpierce/rust-base64),
 [basic-toml](https://github.com/dtolnay/basic-toml),
+[bhttp](https://github.com/martinthomson/ohttp),
 [bitflags](https://github.com/bitflags/bitflags),
 [block-buffer](https://github.com/RustCrypto/utils),
 [camino](https://github.com/camino-rs/camino),
 [cargo-platform](https://github.com/rust-lang/cargo),
 [cc](https://github.com/rust-lang/cc-rs),
+[cexpr](https://github.com/jethrogb/rust-cexpr),
 [cfg-if](https://github.com/alexcrichton/cfg-if),
 [chrono](https://github.com/chronotope/chrono),
+[clang-sys](https://github.com/KyleMayes/clang-sys),
 [core-foundation-sys](https://github.com/servo/core-foundation-rs),
 [cpufeatures](https://github.com/RustCrypto/utils),
 [crypto-common](https://github.com/RustCrypto/traits),
@@ -492,6 +497,7 @@ The following text applies to code linked from these dependencies:
 [log](https://github.com/rust-lang/log),
 [minimal-lexical](https://github.com/Alexhuszagh/minimal-lexical),
 [num-traits](https://github.com/rust-num/num-traits),
+[ohttp](https://github.com/martinthomson/ohttp),
 [once_cell](https://github.com/matklad/once_cell),
 [parking_lot](https://github.com/Amanieu/parking_lot),
 [parking_lot_core](https://github.com/Amanieu/parking_lot),
@@ -1589,6 +1595,27 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
+```
+-------------
+## ISC License: libloading
+
+The following text applies to code linked from these dependencies:
+[libloading](https://github.com/nagisa/rust_libloading/)
+
+```
+Copyright © 2015, Simonas Kazlauskas
+
+Permission to use, copy, modify, and/or distribute this software for any purpose with or without
+fee is hereby granted, provided that the above copyright notice and this permission notice appear
+in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
+AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.
+
 ```
 -------------
 ## ISC License: ring
@@ -1647,6 +1674,44 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+```
+-------------
+## BSD-3-Clause License: bindgen
+
+The following text applies to code linked from these dependencies:
+[bindgen](https://github.com/rust-lang/rust-bindgen)
+
+```
+BSD 3-Clause License
+
+Copyright (c) 2013, Jyun-Yan You
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of the copyright holder nor the names of its
+  contributors may be used to endorse or promote products derived from
+  this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 ```
 -------------
 ## BSD-3-Clause License: protobuf

megazords/full/DEPENDENCIES.md

@@ -104,6 +104,10 @@ the details of which are reproduced below.
     <name>Apache License 2.0: basic-toml</name>
     <url>https://github.com/dtolnay/basic-toml/blob/master/LICENSE-APACHE</url>
   </license>
+  <license>
+    <name>Apache License 2.0: bhttp</name>
+    <url>https://github.com/martinthomson/ohttp/blob/main/LICENSE-APACHE</url>
+  </license>
   <license>
     <name>Apache License 2.0: bitflags</name>
     <url>https://github.com/bitflags/bitflags/blob/main/LICENSE-APACHE</url>
@@ -124,6 +128,10 @@ the details of which are reproduced below.
     <name>Apache License 2.0: cc</name>
     <url>https://github.com/rust-lang/cc-rs/blob/main/LICENSE-APACHE</url>
   </license>
+  <license>
+    <name>Apache License 2.0: cexpr</name>
+    <url>https://github.com/jethrogb/rust-cexpr/blob/master/LICENSE-APACHE</url>
+  </license>
   <license>
     <name>Apache License 2.0: cfg-if</name>
     <url>https://github.com/alexcrichton/cfg-if/blob/main/LICENSE-APACHE</url>
@@ -132,6 +140,10 @@ the details of which are reproduced below.
     <name>Apache License 2.0: chrono</name>
     <url>https://github.com/chronotope/chrono/blob/main/LICENSE.txt</url>
   </license>
+  <license>
+    <name>Apache License 2.0: clang-sys</name>
+    <url>https://github.com/KyleMayes/clang-sys/blob/master/LICENSE.txt</url>
+  </license>
   <license>
     <name>Apache License 2.0: core-foundation-sys</name>
     <url>https://github.com/servo/core-foundation-rs/blob/main/LICENSE-APACHE</url>
@@ -292,6 +304,10 @@ the details of which are reproduced below.
     <name>Apache License 2.0: num-traits</name>
     <url>https://github.com/rust-num/num-traits/blob/master/LICENSE-APACHE</url>
   </license>
+  <license>
+    <name>Apache License 2.0: ohttp</name>
+    <url>https://github.com/martinthomson/ohttp/blob/main/LICENSE-APACHE</url>
+  </license>
   <license>
     <name>Apache License 2.0: once_cell</name>
     <url>https://github.com/matklad/once_cell/blob/master/LICENSE-APACHE</url>
@@ -640,6 +656,10 @@ the details of which are reproduced below.
     <name>CC0-1.0 License: base16</name>
     <url>https://github.com/thomcc/rust-base16/blob/master/LICENSE-APACHE</url>
   </license>
+  <license>
+    <name>ISC License: libloading</name>
+    <url>https://github.com/nagisa/rust_libloading/blob//master/LICENSE</url>
+  </license>
   <license>
     <name>ISC License: ring</name>
     <url>https://github.com/briansmith/ring/blob/master/LICENSE</url>
@@ -648,6 +668,10 @@ the details of which are reproduced below.
     <name>BSD-2-Clause License: arrayref</name>
     <url>https://github.com/droundy/arrayref/blob/master/LICENSE</url>
   </license>
+  <license>
+    <name>BSD-3-Clause License: bindgen</name>
+    <url>https://github.com/rust-lang/rust-bindgen/blob/main/LICENSE</url>
+  </license>
   <license>
     <name>BSD-3-Clause License: protobuf</name>
     <url>https://github.com/protocolbuffers/protobuf/blob/master/LICENSE</url>