Snap for 6439596 from 158f084de4880d7241a9cd9c4d0e5571e9ea6a2b to qt-aml-tzdata-releaseandroid-mainline-10.0.0_r11android10-mainline-tzdata-release

Change-Id: Ic069ec81d42b4f41f47941f7dd8cbd752452dbc8

3 files changed, 1 insertions, 96 deletions

diff --git a/Android.bp b/Android.bp
index 8765a5fd..4fa62844 100644
--- a/Android.bp
+++ b/Android.bp
@@ -91,7 +91,6 @@ cc_defaults {
     name: "jemalloc5_defaults",
     defaults: ["linux_bionic_supported"],
     host_supported: true,
-    native_bridge_supported: true,
     cflags: common_cflags,
 
     target: {
diff --git a/android/conf.sh b/android/conf.sh
deleted file mode 100755
index 90195a42..00000000
--- a/android/conf.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-# This script is used to run configure and generate all of the necessary
-# files when updating to a new version of jemalloc.
-# The NDK argument must be a NDK at r20 or newer so that it does not
-# require installing the standalone tools.
-
-ndk=${1}
-if [[ "$ndk" == "" ]]; then
-  echo "Requires two arguments."
-  echo "usage: conf.sh NDK ARCH"
-  exit 1
-fi
-
-arch=${2}
-if [[ "$arch" == "" ]]; then
-  echo "Requires two arguments."
-  echo "usage: conf.sh NDK ARCH"
-  exit 1
-fi
-
-if [[ ! -d ${ndk} ]]; then
-  echo "NDK directory ${ndk} does not exist."
-  exit 1
-fi
-toolchain=${ndk}/toolchains/llvm/prebuilt/linux-x86_64
-if [[ ! -d ${toolchain} ]]; then
-  echo "NDK ${ndk} cannot find toolchain directory."
-  echo "  ${toolchain}"
-  exit 1
-fi
-
-# The latest version of clang to use for compilation.
-latest_api=29
-
-case "$arch" in
-  "arm")
-    prefix="arm-linux-androideabi"
-    clang_prefix="armv7a-linux-androideabi"
-    target="arm-android-linux"
-    ;;
-  "arm64")
-    prefix="aarch64-linux-android"
-    target="aarch64-android-linux"
-    ;;
-  "x86")
-    target="x86-android-linux"
-    export CPPFLAGS="-m32"
-    ;&
-  "x86_64")
-    prefix="x86_64-linux-android"
-    if [[ "$target" == "" ]]; then
-      target="x86_64-android-linux"
-    fi
-    ;;
-  *)
-    echo "Unknown arch $arch"
-    exit 1
-    ;;
-esac
-
-if [[ "${clang_prefix}" == "" ]]; then
-  clang_prefix="${prefix}"
-fi
-
-tools=("AR" "ar"
-       "AS" "as"
-       "LD" "ld"
-       "RANLIB" "ranlib"
-       "STRIP" "strip")
-
-for ((i = 0; i < ${#tools[@]}; i = i + 2)); do
-  binary=${toolchain}/bin/${prefix}-${tools[$((i + 1))]}
-  if [[ ! -e ${binary} ]]; then
-    echo "${binary} does not exist."
-    exit 1
-  fi
-  export ${tools[$i]}=${binary}
-done
-
-clang=("CC" "clang"
-       "CXX" "clang++")
-
-for ((i = 0; i < ${#clang[@]}; i = i + 2)); do
-  binary=${toolchain}/bin/${clang_prefix}${latest_api}-${clang[$((i + 1))]}
-  if [[ ! -e ${binary} ]]; then
-    echo "${binary} does not exist."
-    exit 1
-  fi
-  export ${clang[$i]}=${binary}
-done
-
-export CPP="${CC} -E"
-
-./autogen.sh --with-jemalloc_prefix=je_ --host=${target}
diff --git a/src/android_je_iterate.c b/src/android_je_iterate.c
index b21bfe97..ca776e00 100644
--- a/src/android_je_iterate.c
+++ b/src/android_je_iterate.c
@@ -17,7 +17,7 @@
 static pthread_mutex_t malloc_disabled_lock = PTHREAD_MUTEX_INITIALIZER;
 static bool malloc_disabled_tcache;
 
-int je_malloc_iterate(uintptr_t base, size_t size,
+int je_iterate(uintptr_t base, size_t size,
     void (*callback)(uintptr_t ptr, size_t size, void* arg), void* arg) {
   size_t pagesize = getpagesize();
   tsd_t* tsd = tsd_fetch_min();