diff options
author | Kaiyi Li <kaiyili@google.com> | 2023-08-03 20:09:26 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-08-03 20:09:26 +0000 |
commit | b956bc38747e0147f3f7b75e2a3ff9deafade4fe (patch) | |
tree | 59bbe1469f23a94eef21cf26f2ec892299760aec | |
parent | 0eb8edb1435f4c6273d3f8b745c3a1acb2c19028 (diff) | |
parent | 56b0c9f5bac97f5fc4e86ab84fbbba4c4722e1a5 (diff) | |
download | vulkano-b956bc38747e0147f3f7b75e2a3ff9deafade4fe.tar.gz |
upgrade vulkano: modify upgrade config am: 56b0c9f5ba
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/vulkano/+/2650378
Change-Id: Ie4818dfee0f70f979b01640a6446afaa3d6cc109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | cargo2android.json | 5 | ||||
-rw-r--r-- | patches/device_memory.rs.patch | 40 | ||||
-rw-r--r-- | patches/instance.rs.patch | 38 | ||||
-rw-r--r-- | patches/properties.rs.patch | 13 |
4 files changed, 3 insertions, 93 deletions
diff --git a/cargo2android.json b/cargo2android.json index 6dee77b..9a5297d 100644 --- a/cargo2android.json +++ b/cargo2android.json @@ -7,5 +7,6 @@ "device": true, "no-presubmit": true, "run": true, - "tests": true -}
\ No newline at end of file + "tests": false, + "features": "" +} diff --git a/patches/device_memory.rs.patch b/patches/device_memory.rs.patch deleted file mode 100644 index becf2c2..0000000 --- a/patches/device_memory.rs.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/src/memory/device_memory.rs b/src/memory/device_memory.rs -index 7f6bc8ff..be1eed9f 100644 ---- a/src/memory/device_memory.rs -+++ b/src/memory/device_memory.rs -@@ -19,7 +19,7 @@ use crate::OomError; - use crate::VulkanObject; - use std::error; - use std::fmt; --#[cfg(target_os = "linux")] -+#[cfg(any(target_os = "android", target_os = "linux"))] - use std::fs::File; - use std::marker::PhantomData; - use std::mem::MaybeUninit; -@@ -27,7 +27,7 @@ use std::ops::Deref; - use std::ops::DerefMut; - use std::ops::Range; - use std::os::raw::c_void; --#[cfg(target_os = "linux")] -+#[cfg(any(target_os = "android", target_os = "linux"))] - use std::os::unix::io::{FromRawFd, IntoRawFd}; - use std::ptr; - use std::sync::Arc; -@@ -178,7 +178,7 @@ impl<'a> DeviceMemoryBuilder<'a> { - /// # Panic - /// - /// - Panics if the import info has already been set. -- #[cfg(target_os = "linux")] -+ #[cfg(any(target_os = "android", target_os = "linux"))] - pub fn import_info( - mut self, - fd: File, -@@ -572,7 +572,7 @@ impl DeviceMemory { - /// - /// - Panics if the user requests an invalid handle type for this device memory object. - #[inline] -- #[cfg(target_os = "linux")] -+ #[cfg(any(target_os = "android", target_os = "linux"))] - pub fn export_fd( - &self, - handle_type: ExternalMemoryHandleType, diff --git a/patches/instance.rs.patch b/patches/instance.rs.patch deleted file mode 100644 index e3409fd..0000000 --- a/patches/instance.rs.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/instance/instance.rs b/src/instance/instance.rs -index b887f1e2..d9f02276 100644 ---- a/src/instance/instance.rs -+++ b/src/instance/instance.rs -@@ -541,12 +541,12 @@ impl<'a> ApplicationInfo<'a> { - #[deprecated(note = "Please use the `app_info_from_cargo_toml!` macro instead")] - pub fn from_cargo_toml() -> ApplicationInfo<'a> { - let version = Version { -- major: env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(), -- minor: env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(), -- patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(), -+ major: 0, -+ minor: 0, -+ patch: 0, - }; - -- let name = env!("CARGO_PKG_NAME"); -+ let name = ""; - - ApplicationInfo { - application_name: Some(name.into()), -@@ -568,12 +568,12 @@ impl<'a> ApplicationInfo<'a> { - macro_rules! app_info_from_cargo_toml { - () => {{ - let version = $crate::instance::Version { -- major: env!("CARGO_PKG_VERSION_MAJOR").parse().unwrap(), -- minor: env!("CARGO_PKG_VERSION_MINOR").parse().unwrap(), -- patch: env!("CARGO_PKG_VERSION_PATCH").parse().unwrap(), -+ major: 0, -+ minor: 0, -+ patch: 0, - }; - -- let name = env!("CARGO_PKG_NAME"); -+ let name = ""; - - $crate::instance::ApplicationInfo { - application_name: Some(name.into()), diff --git a/patches/properties.rs.patch b/patches/properties.rs.patch deleted file mode 100644 index 69d5b09..0000000 --- a/patches/properties.rs.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/device/properties.rs b/src/device/properties.rs -index be1c36d..8628cb0 100644 ---- a/src/device/properties.rs -+++ b/src/device/properties.rs -@@ -212,7 +212,7 @@ impl<const N: usize> FromVulkan<[f32; N]> for [f32; N] { - - impl<const N: usize> FromVulkan<[std::os::raw::c_char; N]> for String { - #[inline] -- fn from_vulkan(val: [i8; N]) -> Option<Self> { -+ fn from_vulkan(val: [std::os::raw::c_char; N]) -> Option<Self> { - Some(unsafe { CStr::from_ptr(val.as_ptr()).to_string_lossy().into_owned() }) - } - } |