Remove old jemalloc version.
The external/jemalloc_new is the latest version of jemalloc and this
old version is no longer needed.
Test: Builds.
Change-Id: I1a7e17c770496759b040a70087e27ece58250fbe
diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index 253dbdc..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,379 +0,0 @@
-package {
- default_applicable_licenses: ["external_jemalloc_license"],
-}
-
-license {
- name: "external_jemalloc_license",
- visibility: [":__subpackages__"],
- license_kinds: [
- "SPDX-license-identifier-Apache-2.0",
- "SPDX-license-identifier-BSD",
- "SPDX-license-identifier-ISC",
- "SPDX-license-identifier-MIT",
- "legacy_unencumbered",
- ],
- license_text: [
- "COPYING",
- "NOTICE",
- ],
-}
-
-common_cflags = [
- "-D_REENTRANT",
- "-O3",
- "-funroll-loops",
- "-fvisibility=hidden",
- "-Werror",
- "-Wno-unused-parameter",
- "-Wno-type-limits",
-]
-
-// These parameters change the way jemalloc works.
-// ANDROID_MAX_ARENAS=XX
-// The total number of arenas will be less than or equal to this number.
-// The number of arenas will be calculated as 2 * the number of cpus
-// but no larger than XX.
-// ANDROID_TCACHE_NSLOTS_SMALL_MAX=XX
-// The number of small slots held in the tcache. The higher this number
-// is, the higher amount of PSS consumed. If this number is set too low
-// then small allocations will take longer to complete.
-// ANDROID_TCACHE_NSLOTS_LARGE=XX
-// The number of large slots held in the tcache. The higher this number
-// is, the higher amount of PSS consumed. If this number is set too low
-// then large allocations will take longer to complete.
-// ANDROID_LG_TCACHE_MAXCLASS_DEFAULT=XX
-// 1 << XX is the maximum sized allocation that will be in the tcache.
-// ANDROID_LG_CHUNK_DEFAULT=XX
-// 1 << XX is the default chunk size used by the system. Decreasing this
-// usually decreases the amount of PSS used, but can increase
-// fragmentation.
-
-android_common_cflags = [
- // Default to a single arena for svelte configurations to minimize
- // PSS. This will be overridden by android_product_variables for
- // non-svelte configs.
- "-DANDROID_MAX_ARENAS=1",
- "-DANDROID_LG_TCACHE_MAXCLASS_DEFAULT=16",
-]
-
-common_c_local_includes = [
- "src",
- "include",
-]
-
-android_product_variables = {
- // Only enable the tcache on non-svelte configurations, to save PSS.
- malloc_not_svelte: {
- cflags: [
- "-UANDROID_MAX_ARENAS",
- "-DANDROID_MAX_ARENAS=2",
- "-DJEMALLOC_TCACHE",
- "-DANDROID_TCACHE_NSLOTS_SMALL_MAX=8",
- "-DANDROID_TCACHE_NSLOTS_LARGE=16",
- ],
- },
-}
-
-cc_defaults {
- name: "jemalloc_defaults",
- defaults: ["linux_bionic_supported"],
- host_supported: true,
- cflags: common_cflags,
-
- target: {
- android: {
- cflags: android_common_cflags + [
- "-include android/include/log.h",
- ],
- product_variables: android_product_variables,
- },
- linux_bionic: {
- cflags: ["-DJEMALLOC_TCACHE"],
- },
- linux_glibc: {
- enabled: true,
- },
- },
-
- multilib: {
- lib32: {
- // Use a 512K chunk size on 32 bit systems.
- // This keeps the total amount of virtual address space consumed
- // by jemalloc lower.
- cflags: [
- "-DANDROID_LG_CHUNK_DEFAULT=19",
- ],
- },
- lib64: {
- // Use a 2MB chunk size on 64 bit systems.
- // This is the default currently used by 4.0.0
- cflags: [
- "-DANDROID_LG_CHUNK_DEFAULT=21",
- ],
- },
- },
-
- local_include_dirs: common_c_local_includes,
- stl: "none",
-}
-
-lib_src_files = [
- "src/arena.c",
- "src/atomic.c",
- "src/base.c",
- "src/bitmap.c",
- "src/chunk.c",
- "src/chunk_dss.c",
- "src/chunk_mmap.c",
- "src/ckh.c",
- "src/ctl.c",
- "src/extent.c",
- "src/hash.c",
- "src/huge.c",
- "src/jemalloc.c",
- "src/mb.c",
- "src/mutex.c",
- "src/nstime.c",
- "src/pages.c",
- "src/prng.c",
- "src/prof.c",
- "src/quarantine.c",
- "src/rtree.c",
- "src/spin.c",
- "src/stats.c",
- "src/tcache.c",
- "src/ticker.c",
- "src/tsd.c",
- "src/util.c",
- "src/witness.c",
-]
-
-//-----------------------------------------------------------------------
-// jemalloc static library
-//-----------------------------------------------------------------------
-cc_library {
- name: "libjemalloc",
- recovery_available: true,
-
- defaults: ["jemalloc_defaults"],
-
- target: {
- android: {
- shared: {
- enabled: false,
- },
- },
- },
-
- srcs: lib_src_files,
-}
-
-//-----------------------------------------------------------------------
-// jemalloc static jet library
-//-----------------------------------------------------------------------
-cc_library_static {
- name: "libjemalloc_jet",
-
- defaults: ["jemalloc_defaults"],
-
- cflags: [
- "-DJEMALLOC_JET",
- ],
-
- srcs: lib_src_files,
-
-}
-
-jemalloc_testlib_srcs = [
- "test/src/btalloc.c",
- "test/src/btalloc_0.c",
- "test/src/btalloc_1.c",
- "test/src/math.c",
- "test/src/mq.c",
- "test/src/mtx.c",
- "test/src/SFMT.c",
- "test/src/test.c",
- "test/src/thd.c",
- "test/src/timer.c",
-]
-
-//-----------------------------------------------------------------------
-// jemalloc unit test library
-//-----------------------------------------------------------------------
-cc_library_static {
- name: "libjemalloc_unittest",
-
- defaults: ["jemalloc_defaults"],
- cflags: [
- "-DJEMALLOC_UNIT_TEST",
- ],
-
- local_include_dirs: [
- "test/src",
- "test/include",
- ],
-
- srcs: jemalloc_testlib_srcs,
-
- whole_static_libs: ["libjemalloc_jet"],
-}
-
-//-----------------------------------------------------------------------
-// jemalloc unit tests
-//-----------------------------------------------------------------------
-unit_tests = [
- "test/unit/a0.c",
- "test/unit/arena_reset.c",
- "test/unit/atomic.c",
- "test/unit/bitmap.c",
- "test/unit/ckh.c",
- "test/unit/decay.c",
- "test/unit/fork.c",
- "test/unit/hash.c",
- "test/unit/junk.c",
- "test/unit/junk_alloc.c",
- "test/unit/junk_free.c",
- "test/unit/lg_chunk.c",
- "test/unit/mallctl.c",
- "test/unit/math.c",
- "test/unit/mq.c",
- "test/unit/mtx.c",
- "test/unit/nstime.c",
- "test/unit/pack.c",
- "test/unit/pages.c",
- "test/unit/prng.c",
- "test/unit/prof_accum.c",
- "test/unit/prof_active.c",
- "test/unit/prof_gdump.c",
- "test/unit/prof_idump.c",
- "test/unit/prof_reset.c",
- "test/unit/prof_thread_name.c",
- "test/unit/ql.c",
- "test/unit/qr.c",
- "test/unit/quarantine.c",
- "test/unit/rb.c",
- "test/unit/rtree.c",
- "test/unit/run_quantize.c",
- "test/unit/SFMT.c",
- "test/unit/size_classes.c",
- "test/unit/smoothstep.c",
- "test/unit/stats.c",
- "test/unit/ticker.c",
- "test/unit/tsd.c",
- "test/unit/util.c",
- "test/unit/witness.c",
- "test/unit/zero.c",
-]
-
-cc_test {
- name: "jemalloc_unittests",
-
- defaults: ["jemalloc_defaults"],
-
- gtest: false,
-
- cflags: common_cflags + [
- "-DJEMALLOC_UNIT_TEST",
- ],
-
- local_include_dirs: common_c_local_includes + [
- "test/src",
- "test/include",
- ],
-
- srcs: unit_tests,
-
- static_libs: ["libjemalloc_unittest"],
-
- shared_libs: ["liblog"],
-
- test_per_src: true,
-
- target: {
- linux_glibc: {
- // The sanitizer does not work for these tests on the host.
- sanitize: {
- never: true,
- },
- },
- },
-}
-
-//-----------------------------------------------------------------------
-// jemalloc integration test library
-//-----------------------------------------------------------------------
-cc_library_static {
- name: "libjemalloc_integrationtest",
-
- defaults: ["jemalloc_defaults"],
-
- cflags: [
- "-DJEMALLOC_INTEGRATION_TEST",
- ],
-
- local_include_dirs: [
- "test/src",
- "test/include",
- ],
-
- srcs: jemalloc_testlib_srcs + lib_src_files,
-
-}
-
-//-----------------------------------------------------------------------
-// jemalloc integration tests
-//-----------------------------------------------------------------------
-integration_tests = [
- "test/integration/aligned_alloc.c",
- "test/integration/allocated.c",
- "test/integration/chunk.c",
- "test/integration/MALLOCX_ARENA.c",
- "test/integration/mallocx.c",
- "test/integration/overflow.c",
- "test/integration/posix_memalign.c",
- "test/integration/rallocx.c",
- "test/integration/sdallocx.c",
- "test/integration/thread_arena.c",
- "test/integration/thread_tcache_enabled.c",
- "test/integration/xallocx.c",
-]
-
-android_integration_tests = [
- "test/integration/iterate.c",
-]
-
-cc_test {
- name: "jemalloc_integrationtests",
-
- defaults: ["jemalloc_defaults"],
-
- gtest: false,
-
- cflags: common_cflags + [
- "-DJEMALLOC_INTEGRATION_TEST",
- ],
-
- local_include_dirs: common_c_local_includes + [
- "test/src",
- "test/include",
- ],
-
- srcs: integration_tests,
- target: {
- android: {
- srcs: android_integration_tests,
- },
- linux_glibc: {
- // The sanitizer does not work for these tests on the host.
- sanitize: {
- never: true,
- },
- },
- },
-
- static_libs: ["libjemalloc_integrationtest"],
-
- shared_libs: ["liblog"],
-
- test_per_src: true,
-}
