Commit 8fd66fef authored by Mark Hammond's avatar Mark Hammond
Browse files

Bug 1801295 (part 2) - vendor new application-services with the fix. r=skhamis 

Depends on D164781

Differential Revision: https://phabricator.services.mozilla.com/D164782
parent efb859df

.cargo/config.in

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ rev = "fb7a2b12ced3b43e6a268621989c6191d1ed7e39" 
[source."https://github.com/mozilla/application-services"]

git = "https://github.com/mozilla/application-services"

replace-with = "vendored-sources"

rev = "ba67a665dd086b1ea5f1fad638843e82bf9208b4"

rev = "51b984ecb21ba00694c3eee33364123a064a7cbb"



[source."https://github.com/mozilla-spidermonkey/jsparagus"]

git = "https://github.com/mozilla-spidermonkey/jsparagus"

Cargo.lock

+9 −9
Original line number Diff line number Diff line
@@ -1571,7 +1571,7 @@ dependencies = [ 
[[package]]

name = "error-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "lazy_static",

 "log",
@@ -2710,7 +2710,7 @@ dependencies = [ 
[[package]]

name = "interrupt-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "lazy_static",

 "parking_lot 0.12.999",
@@ -3823,7 +3823,7 @@ dependencies = [ 
[[package]]

name = "nss_build_common"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"



[[package]]

name = "nsstring"
@@ -5039,7 +5039,7 @@ dependencies = [ 
[[package]]

name = "sql-support"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "ffi-support",

 "interrupt-support",
@@ -5221,7 +5221,7 @@ dependencies = [ 
[[package]]

name = "sync-guid"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "base64",

 "rand 0.8.5",
@@ -5232,7 +5232,7 @@ dependencies = [ 
[[package]]

name = "sync15"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "anyhow",

 "error-support",
@@ -5262,7 +5262,7 @@ dependencies = [ 
[[package]]

name = "tabs"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "anyhow",

 "error-support",
@@ -6007,7 +6007,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" 
[[package]]

name = "viaduct"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "ffi-support",

 "log",
@@ -6164,7 +6164,7 @@ dependencies = [ 
[[package]]

name = "webext-storage"

version = "0.1.0"

source = "git+https://github.com/mozilla/application-services?rev=ba67a665dd086b1ea5f1fad638843e82bf9208b4#ba67a665dd086b1ea5f1fad638843e82bf9208b4"

source = "git+https://github.com/mozilla/application-services?rev=51b984ecb21ba00694c3eee33364123a064a7cbb#51b984ecb21ba00694c3eee33364123a064a7cbb"

dependencies = [

 "error-support",

 "ffi-support",

Cargo.toml

+6 −6
Original line number Diff line number Diff line
@@ -164,12 +164,12 @@ midir = { git = "https://github.com/mozilla/midir.git", rev = "519e651241e867af3 
minidump_writer_linux = { git = "https://github.com/rust-minidump/minidump-writer.git", rev = "75ada456c92a429704691a85e1cb42fef8cafc0d" }



# application-services overrides to make updating them all simpler.

interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "ba67a665dd086b1ea5f1fad638843e82bf9208b4" }

sql-support = { git = "https://github.com/mozilla/application-services", rev = "ba67a665dd086b1ea5f1fad638843e82bf9208b4" }

sync15 = { git = "https://github.com/mozilla/application-services", rev = "ba67a665dd086b1ea5f1fad638843e82bf9208b4" }

tabs = { git = "https://github.com/mozilla/application-services", rev = "ba67a665dd086b1ea5f1fad638843e82bf9208b4" }

viaduct = { git = "https://github.com/mozilla/application-services", rev = "ba67a665dd086b1ea5f1fad638843e82bf9208b4" }

webext-storage = { git = "https://github.com/mozilla/application-services", rev = "ba67a665dd086b1ea5f1fad638843e82bf9208b4" }

interrupt-support = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }

sql-support = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }

sync15 = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }

tabs = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }

viaduct = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }

webext-storage = { git = "https://github.com/mozilla/application-services", rev = "51b984ecb21ba00694c3eee33364123a064a7cbb" }



# Patch mio 0.6 to use winapi 0.3 and miow 0.3, getting rid of winapi 0.2.

# There is not going to be new version of mio 0.6, mio now being >= 0.7.11.

third_party/rust/nss_build_common/.cargo-checksum.json

+1 −1
Original line number Diff line number Diff line 
{"files":{"Cargo.toml":"581bb074971ef67adecd37f82da27105fbcf7bb4bd289eaf6e284a51835ce193","src/lib.rs":"1cc8b6952a2b2d730f2a4def8c72b07517b31744814c62be9cae6bed8d340ec0"},"package":null}
 
 No newline at end of file
 
{"files":{"Cargo.toml":"581bb074971ef67adecd37f82da27105fbcf7bb4bd289eaf6e284a51835ce193","src/lib.rs":"16da98eba3da05784442815d1ead70bbe0cce8440913ee367e72711ee4874d60"},"package":null}
 
 No newline at end of file

third_party/rust/nss_build_common/src/lib.rs

+2 −1
Original line number Diff line number Diff line
@@ -114,12 +114,13 @@ fn get_nss_libs(kind: LinkingKind) -> Vec<&'static str> { 
            // Hardware specific libs.

            let target_arch = env::var("CARGO_CFG_TARGET_ARCH").unwrap();

            let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();

            // https://searchfox.org/nss/rev/08c4d05078d00089f8d7540651b0717a9d66f87e/lib/freebl/freebl.gyp#278-296

            // https://searchfox.org/nss/rev/0d5696b3edce5124353f03159d2aa15549db8306/lib/freebl/freebl.gyp#508-542

            if target_arch == "arm" || target_arch == "aarch64" {

                static_libs.push("armv8_c_lib");

            }

            if target_arch == "x86_64" || target_arch == "x86" {

                static_libs.push("gcm-aes-x86_c_lib");

                static_libs.push("sha-x86_c_lib");

            }

            if target_arch == "arm" {

                static_libs.push("gcm-aes-arm32-neon_c_lib")