diff --git a/.travis.yml b/.travis.yml index dc0984c68..19c6b18ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,12 +19,12 @@ matrix: script: - cross test --target=aarch64-linux-android -p parity-util-mem - os: osx - osx_image: xcode11.2 + osx_image: xcode11.3 addons: chrome: stable firefox: latest install: - - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | sh + - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | sh - source ~/.nvm/nvm.sh - nvm install --lts - npm install -g chromedriver diff --git a/parity-util-mem/src/allocators.rs b/parity-util-mem/src/allocators.rs index e159a32d0..45df9cba2 100644 --- a/parity-util-mem/src/allocators.rs +++ b/parity-util-mem/src/allocators.rs @@ -96,7 +96,7 @@ mod usable_size { mimalloc_sys::mi_usable_size(ptr as *mut _) } - } else if #[cfg(target_os = "linux")] { + } else if #[cfg(any(target_os = "linux", target_os = "android"))] { /// Linux call system allocator (currently malloc). extern "C" {