Upgrade rust/crates/clang-sys to 1.3.3 am: 259dac6a71 am: ab8217957e am: 17991d82a6 am: aea818aafe

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/clang-sys/+/2138215

Change-Id: If429dd657590e325544c6dc63ace9a2afbde6407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

9 files changed, 43 insertions, 9 deletions

diff --git a/.cargo_vcs_info.json b/.cargo_vcs_info.json
index ac25bc0..b830e59 100644
--- a/.cargo_vcs_info.json
+++ b/.cargo_vcs_info.json
@@ -1,6 +1,6 @@
 {
   "git": {
-    "sha1": "8090d6853624a04b859e8ab2e467bae88a8d4ef6"
+    "sha1": "61dfe583b987265bde526c5a1b3a1baa16fdfff5"
   },
   "path_in_vcs": ""
 }
\ No newline at end of file
diff --git a/Android.bp b/Android.bp
index 197c57a..513d405 100644
--- a/Android.bp
+++ b/Android.bp
@@ -32,7 +32,7 @@ rust_library_host {
     name: "libclang_sys",
     crate_name: "clang_sys",
     cargo_env_compat: true,
-    cargo_pkg_version: "1.3.1",
+    cargo_pkg_version: "1.3.3",
     srcs: [
         "src/lib.rs",
         ":copy_clang-sys_build_out",
@@ -59,4 +59,8 @@ rust_library_host {
         "liblibc",
         "liblibloading",
     ],
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 681cde4..1458d6a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [1.3.3] - 2022-05-28
+
+### Fixed
+- Fixed `Clang::find` to check that `CLANG_PATH` is an executable file before
+selecting it
+
+## [1.3.2] - 2022-05-18
+
+### Added
+- Added support for illumos and derivatives
+
 ## [1.3.1] - 2022-02-03
 
 ### Added
diff --git a/Cargo.toml b/Cargo.toml
index 3f4fe6d..770af1d 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,7 @@
 
 [package]
 name = "clang-sys"
-version = "1.3.1"
+version = "1.3.3"
 authors = ["Kyle Mayes <kyle@mayeses.com>"]
 build = "build.rs"
 links = "clang"
diff --git a/Cargo.toml.orig b/Cargo.toml.orig
index a78a106..b8875a5 100644
--- a/Cargo.toml.orig
+++ b/Cargo.toml.orig
@@ -3,7 +3,7 @@
 name = "clang-sys"
 authors = ["Kyle Mayes <kyle@mayeses.com>"]
 
-version = "1.3.1"
+version = "1.3.3"
 
 readme = "README.md"
 license = "Apache-2.0"
diff --git a/METADATA b/METADATA
index c8b71ff..b60134f 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@ third_party {
   }
   url {
     type: ARCHIVE
-    value: "https://static.crates.io/crates/clang-sys/clang-sys-1.3.1.crate"
+    value: "https://static.crates.io/crates/clang-sys/clang-sys-1.3.3.crate"
   }
-  version: "1.3.1"
+  version: "1.3.3"
   license_type: NOTICE
   last_upgrade_date {
     year: 2022
-    month: 3
-    day: 1
+    month: 6
+    day: 28
   }
 }
diff --git a/build/common.rs b/build/common.rs
index bc720ca..735d5da 100644
--- a/build/common.rs
+++ b/build/common.rs
@@ -172,6 +172,12 @@ const DIRECTORIES_WINDOWS: &[&str] = &[
     "C:\\Users\\*\\scoop\\apps\\llvm\\current\\bin",
 ];
 
+/// `libclang` directory patterns for illumos
+const DIRECTORIES_ILLUMOS: &[&str] = &[
+    "/opt/ooce/clang-*/lib",
+    "/opt/ooce/llvm-*/lib",
+];
+
 //================================================
 // Searching
 //================================================
@@ -291,6 +297,8 @@ pub fn search_libclang_directories(filenames: &[String], variable: &str) -> Vec<
         DIRECTORIES_MACOS
     } else if cfg!(target_os = "windows") {
         DIRECTORIES_WINDOWS
+    } else if cfg!(target_os = "illumos") {
+        DIRECTORIES_ILLUMOS
     } else {
         &[]
     };
diff --git a/out/common.rs b/out/common.rs
index bc720ca..735d5da 100644
--- a/out/common.rs
+++ b/out/common.rs
@@ -172,6 +172,12 @@ const DIRECTORIES_WINDOWS: &[&str] = &[
     "C:\\Users\\*\\scoop\\apps\\llvm\\current\\bin",
 ];
 
+/// `libclang` directory patterns for illumos
+const DIRECTORIES_ILLUMOS: &[&str] = &[
+    "/opt/ooce/clang-*/lib",
+    "/opt/ooce/llvm-*/lib",
+];
+
 //================================================
 // Searching
 //================================================
@@ -291,6 +297,8 @@ pub fn search_libclang_directories(filenames: &[String], variable: &str) -> Vec<
         DIRECTORIES_MACOS
     } else if cfg!(target_os = "windows") {
         DIRECTORIES_WINDOWS
+    } else if cfg!(target_os = "illumos") {
+        DIRECTORIES_ILLUMOS
     } else {
         &[]
     };
diff --git a/src/support.rs b/src/support.rs
index ff38d39..2b27cc0 100644
--- a/src/support.rs
+++ b/src/support.rs
@@ -58,7 +58,10 @@ impl Clang {
     /// `x86_64-unknown-linux-gnu-clang` for the above example).
     pub fn find(path: Option<&Path>, args: &[String]) -> Option<Clang> {
         if let Ok(path) = env::var("CLANG_PATH") {
-            return Some(Clang::new(path, args));
+            let p = Path::new(&path);
+            if p.is_file() && is_executable(&p).unwrap_or(false) {
+                return Some(Clang::new(p, args));
+            }
         }
 
         // Determine the cross-compilation target, if any.