Merge remote-tracking branch 'aosp/upstream-master' into master.

Re-ran cargo2android.py after merge and fixed up results.

Bug: 158290206
Bug: 161898160
Test: atest -c -m --include-subdirs .
Change-Id: I132f6355bd88139f432bea95fba781c4feec0f00

5 files changed, 20 insertions, 19 deletions

diff --git a/usb_util/Android.bp b/usb_util/Android.bp
index 40ad839af..af31c485a 100644
--- a/usb_util/Android.bp
+++ b/usb_util/Android.bp
@@ -8,9 +8,9 @@ rust_library_host {
     edition: "2018",
     rustlibs: [
         "libassertions",
+        "libbase_rust",
         "libdata_model",
         "liblibc",
-        "libsys_util",
         "libusb_sys",
     ],
     proc_macros: [
@@ -28,9 +28,9 @@ rust_test_host {
     edition: "2018",
     rustlibs: [
         "libassertions",
+        "libbase_rust",
         "libdata_model",
         "liblibc",
-        "libsys_util",
         "libusb_sys",
     ],
     proc_macros: [
@@ -40,6 +40,7 @@ rust_test_host {
 
 // dependent_library ["feature_list"]
 //   ../assertions/src/lib.rs
+//   ../base/src/lib.rs
 //   ../data_model/src/lib.rs
 //   ../sync/src/lib.rs
 //   ../sys_util/poll_token_derive/poll_token_derive.rs
@@ -47,9 +48,9 @@ rust_test_host {
 //   ../syscall_defines/src/lib.rs
 //   ../tempfile/src/lib.rs
 //   ../usb_sys/src/lib.rs
-//   libc-0.2.73 "default,std"
+//   libc-0.2.74 "default,std"
 //   proc-macro2-1.0.19 "default,proc-macro"
 //   quote-1.0.7 "default,proc-macro"
 //   remain-0.2.2
-//   syn-1.0.35 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
+//   syn-1.0.37 "clone-impls,default,derive,full,parsing,printing,proc-macro,quote,visit-mut"
 //   unicode-xid-0.2.1 "default"
diff --git a/usb_util/Cargo.toml b/usb_util/Cargo.toml
index ed505ffa6..c31f67a6f 100644
--- a/usb_util/Cargo.toml
+++ b/usb_util/Cargo.toml
@@ -9,5 +9,5 @@ assertions = { path = "../assertions" }
 data_model = { path = "../data_model" }
 libc = "*"
 remain = "*"
-sys_util = { path = "../sys_util" }
+base = { path = "../base" }
 usb_sys = { path = "../usb_sys" }
diff --git a/usb_util/src/descriptor.rs b/usb_util/src/descriptor.rs
index cf711d1ee..411fef94c 100644
--- a/usb_util/src/descriptor.rs
+++ b/usb_util/src/descriptor.rs
@@ -4,12 +4,12 @@
 
 use crate::types::{self, Descriptor, DescriptorHeader, EndpointDescriptor};
 use crate::{Error, Result};
+use base::warn;
 use data_model::DataInit;
 use std::collections::BTreeMap;
 use std::io::{self, Read};
 use std::mem::size_of;
 use std::ops::Deref;
-use sys_util::warn;
 
 #[derive(Clone)]
 pub struct DeviceDescriptorTree {
diff --git a/usb_util/src/device.rs b/usb_util/src/device.rs
index 8e215f86b..b30d54139 100644
--- a/usb_util/src/device.rs
+++ b/usb_util/src/device.rs
@@ -7,6 +7,7 @@ use crate::{
     ControlRequestDataPhaseTransferDirection, ControlRequestRecipient, ControlRequestType,
     DeviceDescriptor, DeviceDescriptorTree, Error, Result, StandardControlRequest,
 };
+use base::{handle_eintr_errno, IoctlNr};
 use data_model::vec_with_array_field;
 use libc::{EAGAIN, ENODEV, ENOENT};
 use std::convert::TryInto;
@@ -15,7 +16,6 @@ use std::io::{Seek, SeekFrom};
 use std::mem::size_of_val;
 use std::os::raw::{c_int, c_uint, c_void};
 use std::sync::Arc;
-use sys_util::{handle_eintr_errno, IoctlNr};
 
 /// Device represents a USB device.
 pub struct Device {
@@ -69,33 +69,33 @@ impl Device {
     }
 
     unsafe fn ioctl(&self, nr: IoctlNr) -> Result<i32> {
-        let ret = handle_eintr_errno!(sys_util::ioctl(&*self.fd, nr));
+        let ret = handle_eintr_errno!(base::ioctl(&*self.fd, nr));
         if ret < 0 {
-            return Err(Error::IoctlFailed(nr, sys_util::Error::last()));
+            return Err(Error::IoctlFailed(nr, base::Error::last()));
         }
         Ok(ret)
     }
 
     unsafe fn ioctl_with_ref<T>(&self, nr: IoctlNr, arg: &T) -> Result<i32> {
-        let ret = handle_eintr_errno!(sys_util::ioctl_with_ref(&*self.fd, nr, arg));
+        let ret = handle_eintr_errno!(base::ioctl_with_ref(&*self.fd, nr, arg));
         if ret < 0 {
-            return Err(Error::IoctlFailed(nr, sys_util::Error::last()));
+            return Err(Error::IoctlFailed(nr, base::Error::last()));
         }
         Ok(ret)
     }
 
     unsafe fn ioctl_with_mut_ref<T>(&self, nr: IoctlNr, arg: &mut T) -> Result<i32> {
-        let ret = handle_eintr_errno!(sys_util::ioctl_with_mut_ref(&*self.fd, nr, arg));
+        let ret = handle_eintr_errno!(base::ioctl_with_mut_ref(&*self.fd, nr, arg));
         if ret < 0 {
-            return Err(Error::IoctlFailed(nr, sys_util::Error::last()));
+            return Err(Error::IoctlFailed(nr, base::Error::last()));
         }
         Ok(ret)
     }
 
     unsafe fn ioctl_with_mut_ptr<T>(&self, nr: IoctlNr, arg: *mut T) -> Result<i32> {
-        let ret = handle_eintr_errno!(sys_util::ioctl_with_mut_ptr(&*self.fd, nr, arg));
+        let ret = handle_eintr_errno!(base::ioctl_with_mut_ptr(&*self.fd, nr, arg));
         if ret < 0 {
-            return Err(Error::IoctlFailed(nr, sys_util::Error::last()));
+            return Err(Error::IoctlFailed(nr, base::Error::last()));
         }
         Ok(ret)
     }
@@ -434,7 +434,7 @@ impl TransferHandle {
         // Safe because fd is a valid usbdevfs file descriptor and we pass a valid
         // pointer to a usbdevfs_urb structure.
         if unsafe {
-            handle_eintr_errno!(sys_util::ioctl_with_mut_ptr(
+            handle_eintr_errno!(base::ioctl_with_mut_ptr(
                 &*fd,
                 usb_sys::USBDEVFS_DISCARDURB(),
                 urb_ptr
@@ -443,7 +443,7 @@ impl TransferHandle {
         {
             return Err(Error::IoctlFailed(
                 usb_sys::USBDEVFS_DISCARDURB(),
-                sys_util::Error::last(),
+                base::Error::last(),
             ));
         }
 
diff --git a/usb_util/src/error.rs b/usb_util/src/error.rs
index aee89ffbd..5b97c7e90 100644
--- a/usb_util/src/error.rs
+++ b/usb_util/src/error.rs
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+use base::IoctlNr;
 use remain::sorted;
 use std::fmt::{self, Display};
 use std::io;
 use std::num;
-use sys_util::IoctlNr;
 
 #[sorted]
 #[derive(Debug)]
@@ -16,7 +16,7 @@ pub enum Error {
     FdCloneFailed(io::Error),
     InvalidActualLength(num::TryFromIntError),
     InvalidBufferLength(num::TryFromIntError),
-    IoctlFailed(IoctlNr, sys_util::Error),
+    IoctlFailed(IoctlNr, base::Error),
     NoDevice,
     NoSuchDescriptor,
     RcGetMutFailed,