diff options
author | Jeff Vander Stoep <jeffv@google.com> | 2021-02-22 14:37:19 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 14:37:19 +0000 |
commit | ac43ca698e188380bf7da76b20eb05a523248f52 (patch) | |
tree | 7a3cdb504633e78761ebc28f7da3e4267e46e55e | |
parent | 9ddec31372a2b3211291664000503ada65e97131 (diff) | |
parent | 4737f5c18e5cd04b69e607d99ce872254da04fce (diff) | |
download | clang-sys-ac43ca698e188380bf7da76b20eb05a523248f52.tar.gz |
Update to 1.1.1 am: 4737f5c18e
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/1598418
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I85489e7837e03b2e5ab0ab7e846ec4ac029f4ed2
-rw-r--r-- | .cargo_vcs_info.json | 2 | ||||
-rw-r--r-- | Android.bp | 20 | ||||
-rw-r--r-- | CHANGELOG.md | 5 | ||||
-rw-r--r-- | Cargo.toml | 2 | ||||
-rw-r--r-- | Cargo.toml.orig | 4 | ||||
-rw-r--r-- | METADATA | 6 | ||||
-rw-r--r-- | TEST_MAPPING | 4 | ||||
-rw-r--r-- | patches/libloading-0.7.diff | 47 |
8 files changed, 16 insertions, 74 deletions
diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json index a2ce8d7..b4474d7 100644 --- a/.cargo_vcs_info.json +++ b/.cargo_vcs_info.json @@ -1,5 +1,5 @@ { "git": { - "sha1": "a0bcae1a9d7ab6ed8de010b0f5e2b2020c20d204" + "sha1": "fae8e5e15f060bc1fb11c26eac168eaf8a50632b" } } @@ -1,21 +1,5 @@ // This file is generated by cargo2android.py --run --features=runtime,clang_10_0 --dependencies --copy-out. - -package { - default_applicable_licenses: ["external_rust_crates_clang-sys_license"], -} - -// Added automatically by a large-scale-change -// See: http://go/android-license-faq -license { - name: "external_rust_crates_clang-sys_license", - visibility: [":__subpackages__"], - license_kinds: [ - "SPDX-license-identifier-Apache-2.0", - ], - license_text: [ - "LICENSE.txt", - ], -} +// Do not modify this file as changes will be overridden on upgrade. genrule { name: "copy_clang-sys_build_out", @@ -62,4 +46,4 @@ rust_library_host { // cfg-if-1.0.0 // glob-0.3.0 // libc-0.2.86 -// libloading-0.6.7 +// libloading-0.7.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed57c5..a4940fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## [1.1.1] - 2021-02-19 + +### Changed +- Bumped `libloading` version to `0.7` + ## [1.1.0] - 2021-02-09 ### Changed @@ -12,7 +12,7 @@ [package] name = "clang-sys" -version = "1.1.0" +version = "1.1.1" authors = ["Kyle Mayes <kyle@mayeses.com>"] build = "build.rs" links = "clang" diff --git a/Cargo.toml.orig b/Cargo.toml.orig index 0b68df7..f7abf3c 100644 --- a/Cargo.toml.orig +++ b/Cargo.toml.orig @@ -3,7 +3,7 @@ name = "clang-sys" authors = ["Kyle Mayes <kyle@mayeses.com>"] -version = "1.1.0" +version = "1.1.1" readme = "README.md" license = "Apache-2.0" @@ -39,7 +39,7 @@ static = [] glob = "0.3" libc = { version = "0.2.39", default-features = false } -libloading = { version = "0.6", optional = true } +libloading = { version = "0.7", optional = true } [build-dependencies] @@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://static.crates.io/crates/clang-sys/clang-sys-1.1.0.crate" + value: "https://static.crates.io/crates/clang-sys/clang-sys-1.1.1.crate" } - version: "1.1.0" + version: "1.1.1" license_type: NOTICE last_upgrade_date { year: 2021 month: 2 - day: 9 + day: 22 } } diff --git a/TEST_MAPPING b/TEST_MAPPING index 58584f2..7de080a 100644 --- a/TEST_MAPPING +++ b/TEST_MAPPING @@ -2,10 +2,10 @@ { "presubmit": [ { - "name": "keystore2_test" + "name": "libsqlite3-sys_device_test_src_lib" }, { - "name": "libsqlite3-sys_device_test_src_lib" + "name": "keystore2_test" } ] } diff --git a/patches/libloading-0.7.diff b/patches/libloading-0.7.diff deleted file mode 100644 index 49fdc4c..0000000 --- a/patches/libloading-0.7.diff +++ /dev/null @@ -1,47 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 1da2ac4..4af7f4d 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -31,7 +31,7 @@ version = "0.2.39" - default-features = false - - [dependencies.libloading] --version = "0.6" -+version = "0.7" - optional = true - [build-dependencies.glob] - version = "0.3" -diff --git a/src/link.rs b/src/link.rs -index 3230e4a..64a3528 100644 ---- a/src/link.rs -+++ b/src/link.rs -@@ -195,17 +195,19 @@ macro_rules! link { - let (directory, filename) = build::dynamic::find(true)?; - let path = directory.join(filename); - -- let library = libloading::Library::new(&path).map_err(|e| { -- format!( -- "the `libclang` shared library at {} could not be opened: {}", -- path.display(), -- e, -- ) -- }); -+ unsafe { -+ let library = libloading::Library::new(&path).map_err(|e| { -+ format!( -+ "the `libclang` shared library at {} could not be opened: {}", -+ path.display(), -+ e, -+ ) -+ }); - -- let mut library = SharedLibrary::new(library?, path); -- $(load::$name(&mut library);)+ -- Ok(library) -+ let mut library = SharedLibrary::new(library?, path); -+ $(load::$name(&mut library);)+ -+ Ok(library) -+ } - } - - /// Loads a `libclang` shared library for use in the current thread. |