Merge branch 'master' into ao-update-mimalloc

* master: parity-util-mem: use malloc for usable_size on android (#355) CI: troubleshoot macOS build (#356)
paritytech · Mar 12, 2020 · 7949917 · 7949917
2 parents 062333c + 2f3167d
commit 7949917
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,12 +15,12 @@ matrix:
       script:
         - cargo check --all --benches
     - 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
@@ -96,7 +96,7 @@ mod usable_size {
 				libmimalloc_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" {