Remove deprecated Android.mk files
These directories all have Android.bp files that are always used now,
delete the Android.mk files.
Change-Id: I55909868bc16f92819dc582635a782557fe0b5a2
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 49b6498..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,487 +0,0 @@
-#
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH := $(call my-dir)
-
-
-# The following list contains platform-independent functionalities.
-#
-# Skip apple_versioning.c since it is unused.
-# Skip atomic.c since it needs to be built separately according to the docs.
-libcompiler_rt_common_SRC_FILES := \
- lib/builtins/absvdi2.c \
- lib/builtins/absvsi2.c \
- lib/builtins/absvti2.c \
- lib/builtins/adddf3.c \
- lib/builtins/addsf3.c \
- lib/builtins/addtf3.c \
- lib/builtins/addvdi3.c \
- lib/builtins/addvsi3.c \
- lib/builtins/addvti3.c \
- lib/builtins/ashldi3.c \
- lib/builtins/ashlti3.c \
- lib/builtins/ashrdi3.c \
- lib/builtins/ashrti3.c \
- lib/builtins/clear_cache.c \
- lib/builtins/clzdi2.c \
- lib/builtins/clzsi2.c \
- lib/builtins/clzti2.c \
- lib/builtins/cmpdi2.c \
- lib/builtins/cmpti2.c \
- lib/builtins/comparedf2.c \
- lib/builtins/comparesf2.c \
- lib/builtins/comparetf2.c \
- lib/builtins/ctzdi2.c \
- lib/builtins/ctzsi2.c \
- lib/builtins/ctzti2.c \
- lib/builtins/divdc3.c \
- lib/builtins/divdf3.c \
- lib/builtins/divdi3.c \
- lib/builtins/divmoddi4.c \
- lib/builtins/divmodsi4.c \
- lib/builtins/divsc3.c \
- lib/builtins/divsf3.c \
- lib/builtins/divsi3.c \
- lib/builtins/divtf3.c \
- lib/builtins/divti3.c \
- lib/builtins/divxc3.c \
- lib/builtins/eprintf.c \
- lib/builtins/extenddftf2.c \
- lib/builtins/extendhfsf2.c \
- lib/builtins/extendsfdf2.c \
- lib/builtins/extendsftf2.c \
- lib/builtins/ffsdi2.c \
- lib/builtins/ffsti2.c \
- lib/builtins/fixdfdi.c \
- lib/builtins/fixdfsi.c \
- lib/builtins/fixdfti.c \
- lib/builtins/fixsfdi.c \
- lib/builtins/fixsfsi.c \
- lib/builtins/fixsfti.c \
- lib/builtins/fixtfdi.c \
- lib/builtins/fixtfsi.c \
- lib/builtins/fixtfti.c \
- lib/builtins/fixunsdfdi.c \
- lib/builtins/fixunsdfsi.c \
- lib/builtins/fixunsdfti.c \
- lib/builtins/fixunssfdi.c \
- lib/builtins/fixunssfsi.c \
- lib/builtins/fixunssfti.c \
- lib/builtins/fixunstfdi.c \
- lib/builtins/fixunstfsi.c \
- lib/builtins/fixunstfti.c \
- lib/builtins/fixunsxfdi.c \
- lib/builtins/fixunsxfsi.c \
- lib/builtins/fixunsxfti.c \
- lib/builtins/fixxfdi.c \
- lib/builtins/fixxfti.c \
- lib/builtins/floatdidf.c \
- lib/builtins/floatdisf.c \
- lib/builtins/floatdixf.c \
- lib/builtins/floatsidf.c \
- lib/builtins/floatsisf.c \
- lib/builtins/floatsitf.c \
- lib/builtins/floattidf.c \
- lib/builtins/floattisf.c \
- lib/builtins/floattixf.c \
- lib/builtins/floatundidf.c \
- lib/builtins/floatundisf.c \
- lib/builtins/floatundixf.c \
- lib/builtins/floatunsidf.c \
- lib/builtins/floatunsisf.c \
- lib/builtins/floatunsitf.c \
- lib/builtins/floatuntidf.c \
- lib/builtins/floatuntisf.c \
- lib/builtins/floatuntixf.c \
- lib/builtins/gcc_personality_v0.c \
- lib/builtins/int_util.c \
- lib/builtins/lshrdi3.c \
- lib/builtins/lshrti3.c \
- lib/builtins/moddi3.c \
- lib/builtins/modsi3.c \
- lib/builtins/modti3.c \
- lib/builtins/muldc3.c \
- lib/builtins/muldf3.c \
- lib/builtins/muldi3.c \
- lib/builtins/mulodi4.c \
- lib/builtins/mulosi4.c \
- lib/builtins/muloti4.c \
- lib/builtins/mulsc3.c \
- lib/builtins/mulsf3.c \
- lib/builtins/multf3.c \
- lib/builtins/multi3.c \
- lib/builtins/mulvdi3.c \
- lib/builtins/mulvsi3.c \
- lib/builtins/mulvti3.c \
- lib/builtins/mulxc3.c \
- lib/builtins/negdf2.c \
- lib/builtins/negdi2.c \
- lib/builtins/negsf2.c \
- lib/builtins/negti2.c \
- lib/builtins/negvdi2.c \
- lib/builtins/negvsi2.c \
- lib/builtins/negvti2.c \
- lib/builtins/paritydi2.c \
- lib/builtins/paritysi2.c \
- lib/builtins/parityti2.c \
- lib/builtins/popcountdi2.c \
- lib/builtins/popcountsi2.c \
- lib/builtins/popcountti2.c \
- lib/builtins/powidf2.c \
- lib/builtins/powisf2.c \
- lib/builtins/powitf2.c \
- lib/builtins/powixf2.c \
- lib/builtins/subdf3.c \
- lib/builtins/subsf3.c \
- lib/builtins/subtf3.c \
- lib/builtins/subvdi3.c \
- lib/builtins/subvsi3.c \
- lib/builtins/subvti3.c \
- lib/builtins/trampoline_setup.c \
- lib/builtins/truncdfhf2.c \
- lib/builtins/truncdfsf2.c \
- lib/builtins/truncsfhf2.c \
- lib/builtins/trunctfdf2.c \
- lib/builtins/trunctfsf2.c \
- lib/builtins/ucmpdi2.c \
- lib/builtins/ucmpti2.c \
- lib/builtins/udivdi3.c \
- lib/builtins/udivmoddi4.c \
- lib/builtins/udivmodsi4.c \
- lib/builtins/udivmodti4.c \
- lib/builtins/udivsi3.c \
- lib/builtins/udivti3.c \
- lib/builtins/umoddi3.c \
- lib/builtins/umodsi3.c \
- lib/builtins/umodti3.c
-
-# ARM-specific runtimes
-libcompiler_rt_arm_SRC_FILES := \
- lib/builtins/arm/aeabi_dcmp.S \
- lib/builtins/arm/aeabi_div0.c \
- lib/builtins/arm/aeabi_fcmp.S \
- lib/builtins/arm/aeabi_idivmod.S \
- lib/builtins/arm/aeabi_ldivmod.S \
- lib/builtins/arm/aeabi_memcmp.S \
- lib/builtins/arm/aeabi_memcpy.S \
- lib/builtins/arm/aeabi_memmove.S \
- lib/builtins/arm/aeabi_memset.S \
- lib/builtins/arm/aeabi_uidivmod.S \
- lib/builtins/arm/aeabi_uldivmod.S \
- lib/builtins/arm/comparesf2.S \
- lib/builtins/arm/divmodsi4.S \
- lib/builtins/arm/divsi3.S \
- lib/builtins/arm/modsi3.S \
- lib/builtins/arm/udivmodsi4.S \
- lib/builtins/arm/udivsi3.S \
- lib/builtins/arm/umodsi3.S \
- lib/builtins/arm/adddf3vfp.S \
- lib/builtins/arm/addsf3vfp.S \
- lib/builtins/arm/divdf3vfp.S \
- lib/builtins/arm/divsf3vfp.S \
- lib/builtins/arm/eqdf2vfp.S \
- lib/builtins/arm/eqsf2vfp.S \
- lib/builtins/arm/extendsfdf2vfp.S \
- lib/builtins/arm/fixdfsivfp.S \
- lib/builtins/arm/fixsfsivfp.S \
- lib/builtins/arm/fixunsdfsivfp.S \
- lib/builtins/arm/fixunssfsivfp.S \
- lib/builtins/arm/floatsidfvfp.S \
- lib/builtins/arm/floatsisfvfp.S \
- lib/builtins/arm/floatunssidfvfp.S \
- lib/builtins/arm/floatunssisfvfp.S \
- lib/builtins/arm/gedf2vfp.S \
- lib/builtins/arm/gesf2vfp.S \
- lib/builtins/arm/gtdf2vfp.S \
- lib/builtins/arm/gtsf2vfp.S \
- lib/builtins/arm/ledf2vfp.S \
- lib/builtins/arm/lesf2vfp.S \
- lib/builtins/arm/ltdf2vfp.S \
- lib/builtins/arm/ltsf2vfp.S \
- lib/builtins/arm/muldf3vfp.S \
- lib/builtins/arm/mulsf3vfp.S \
- lib/builtins/arm/nedf2vfp.S \
- lib/builtins/arm/negdf2vfp.S \
- lib/builtins/arm/negsf2vfp.S \
- lib/builtins/arm/nesf2vfp.S \
- lib/builtins/arm/subdf3vfp.S \
- lib/builtins/arm/subsf3vfp.S \
- lib/builtins/arm/truncdfsf2vfp.S \
- lib/builtins/arm/unorddf2vfp.S \
- lib/builtins/arm/unordsf2vfp.S
-
-
-# ARM64-specific runtimes
-libcompiler_rt_arm64_SRC_FILES :=
-
-# MIPS-specific runtimes
-libcompiler_rt_mips_SRC_FILES := # nothing to add
-libcompiler_rt_mips64_SRC_FILES := # nothing to add
-
-# X86-specific runtimes
-libcompiler_rt_x86_SRC_FILES := \
- lib/builtins/i386/ashldi3.S \
- lib/builtins/i386/ashrdi3.S \
- lib/builtins/i386/divdi3.S \
- lib/builtins/i386/floatdidf.S \
- lib/builtins/i386/floatdisf.S \
- lib/builtins/i386/floatdixf.S \
- lib/builtins/i386/floatundidf.S \
- lib/builtins/i386/floatundisf.S \
- lib/builtins/i386/floatundixf.S \
- lib/builtins/i386/lshrdi3.S \
- lib/builtins/i386/moddi3.S \
- lib/builtins/i386/muldi3.S \
- lib/builtins/i386/udivdi3.S \
- lib/builtins/i386/umoddi3.S
-
-# X86_64-specific runtimes
-libcompiler_rt_x86_64_SRC_FILES := \
- lib/builtins/x86_64/floatundixf.S \
- lib/builtins/x86_64/floatdisf.c \
- lib/builtins/x86_64/floatdidf.c \
- lib/builtins/x86_64/floatdixf.c \
- lib/builtins/x86_64/floatundisf.S \
- lib/builtins/x86_64/floatundidf.S
-
-# The following list contains functions that are not available in libgcc.a, so
-# we potentially need them when using a Clang-built component (e.g., -ftrapv
-# with 64-bit integer multiplies. See http://llvm.org/bugs/show_bug.cgi?id=14469.)
-libcompiler_rt_extras_SRC_FILES := \
- lib/builtins/mulodi4.c
-
-# $(1): arch
-define get-libcompiler-rt-source-files
- $(if $(findstring $(1),arm),$(call get-libcompiler-rt-arm-source-files),
- $(if $(findstring $(1),mips),$(call get-libcompiler-rt-mips-source-files),
- $(if $(findstring $(1),x86),$(call get-libcompiler-rt-x86-source-files),
- $(if $(findstring $(1),x86_64),$(call get-libcompiler-rt-x86_64-source-files),
- $(if $(findstring $(1),x32),$(call get-libcompiler-rt-x86-source-files),
- $(if $(findstring $(1),arm64),$(call get-libcompiler-rt-arm64-source-files),
- $(if $(findstring $(1),mips64),$(call get-libcompiler-rt-mips64-source-files),
- $(error Unsupported ARCH $(1)))))))))
-endef
-
-# $(1): source list
-# $(2): arch
-#
-# If lib/builtins/<arch>/X.[cS] is included in the source list, we should filter out lib/builtins/X.c
-# in the result source list (i.e., use the one optimized for the arch.) Otherwise
-# there'll be multiple definitions for one symbol.
-define filter-libcompiler-rt-common-source-files
- $(filter-out $(patsubst lib/builtins/$(strip $(2))/%.S,lib/builtins/%.c,\
- $(filter lib/builtins/$(strip $(2))/%.S,$(1))) \
- $(patsubst lib/builtins/$(strip $(2))/%.c,lib/builtins/%.c,\
- $(filter lib/builtins/$(strip $(2))/%.c,$(1))),$(1))
-endef
-
-define get-libcompiler-rt-arm-source-files
- $(call filter-libcompiler-rt-common-source-files,
- $(libcompiler_rt_common_SRC_FILES) \
- $(libcompiler_rt_arm_SRC_FILES), arm)
-endef
-
-define get-libcompiler-rt-arm64-source-files
- $(call filter-libcompiler-rt-common-source-files,
- $(libcompiler_rt_common_SRC_FILES) \
- $(libcompiler_rt_arm64_SRC_FILES),arm64)
-endef
-
-define get-libcompiler-rt-mips-source-files
- $(call filter-libcompiler-rt-common-source-files,
- $(libcompiler_rt_common_SRC_FILES) \
- $(libcompiler_rt_mips_SRC_FILES),mips)
-endef
-
-define get-libcompiler-rt-mips64-source-files
- $(call filter-libcompiler-rt-common-source-files,
- $(libcompiler_rt_common_SRC_FILES) \
- $(libcompiler_rt_mips64_SRC_FILES),mips64)
-endef
-
-define get-libcompiler-rt-x86-source-files
- $(call filter-libcompiler-rt-common-source-files,
- $(libcompiler_rt_common_SRC_FILES) \
- $(libcompiler_rt_x86_SRC_FILES),i386)
-endef
-
-define get-libcompiler-rt-x86_64-source-files
- $(call filter-libcompiler-rt-common-source-files,
- $(libcompiler_rt_common_SRC_FILES) \
- $(libcompiler_rt_x86_64_SRC_FILES),x86_64)
-endef
-
-libcompiler_rt_common_CFLAGS := \
- -Wno-unused-parameter \
- -Werror
-
-#=====================================================================
-# Device Static Library: libcompiler_rt-extras
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcompiler_rt-extras
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_CFLAGS := $(libcompiler_rt_common_CFLAGS)
-LOCAL_CLANG := true
-LOCAL_SRC_FILES := $(libcompiler_rt_extras_SRC_FILES)
-LOCAL_SRC_FILES_mips += lib/builtins/clear_cache.c
-LOCAL_SRC_FILES_mips64 += lib/builtins/clear_cache.c
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_SANITIZE := never
-LOCAL_CXX_STL := none
-
-include $(BUILD_STATIC_LIBRARY)
-
-#=====================================================================
-# Host Static Library: libcompiler_rt-extras
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcompiler_rt-extras
-LOCAL_CFLAGS := $(libcompiler_rt_common_CFLAGS)
-LOCAL_SRC_FILES := $(libcompiler_rt_extras_SRC_FILES)
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-LOCAL_CXX_STL := none
-LOCAL_MODULE_HOST_OS := darwin linux windows
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-# Don't build compiler-rt without clang
-ifneq ($(WITHOUT_TARGET_CLANG), true)
-
-#=====================================================================
-# Device Static Library: libcompiler_rt
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcompiler_rt
-LOCAL_CFLAGS := $(libcompiler_rt_common_CFLAGS)
-LOCAL_CFLAGS_arm += -D__ARM_EABI__
-LOCAL_CFLAGS_mips64 += -DCRT_HAS_128BIT
-LOCAL_ASFLAGS := -integrated-as
-LOCAL_CLANG := true
-LOCAL_SRC_FILES := lib/builtins/enable_execute_stack.c
-LOCAL_SRC_FILES_arm := $(call get-libcompiler-rt-source-files,arm)
-LOCAL_SRC_FILES_arm64 := $(call get-libcompiler-rt-source-files,arm64)
-LOCAL_SRC_FILES_mips := $(call get-libcompiler-rt-source-files,mips)
-LOCAL_SRC_FILES_mips64 := $(call get-libcompiler-rt-source-files,mips64)
-LOCAL_SRC_FILES_x86 := $(call get-libcompiler-rt-source-files,x86)
-LOCAL_SRC_FILES_x86_64 := $(call get-libcompiler-rt-source-files,x86_64)
-LOCAL_SRC_FILES_x86_64 += lib/builtins/ppc/floatditf.c
-LOCAL_MODULE_TARGET_ARCH := arm arm64 mips mips64 x86 x86_64
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_SANITIZE := never
-LOCAL_CXX_STL := none
-
-# These don't actually link, but are required to get exported headers
-LOCAL_STATIC_LIBRARIES_arm64 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_mips := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_mips64 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_x86 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_x86_64 := libunwindbacktrace
-
-include $(BUILD_STATIC_LIBRARY)
-
-#=====================================================================
-# Host Static Library: libcompiler_rt
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcompiler_rt
-LOCAL_CFLAGS := $(libcompiler_rt_common_CFLAGS)
-LOCAL_ASFLAGS := -integrated-as
-LOCAL_CLANG := true
-LOCAL_SRC_FILES_x86 := $(call get-libcompiler-rt-source-files,x86)
-LOCAL_SRC_FILES_x86_64 := $(call get-libcompiler-rt-source-files,x86_64)
-# Only build enable_execute_stack.c on non-Windows hosts.
-LOCAL_SRC_FILES_darwin := lib/builtins/enable_execute_stack.c
-LOCAL_SRC_FILES_linux := lib/builtins/enable_execute_stack.c
-LOCAL_SANITIZE := never
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_MULTILIB := both
-LOCAL_CXX_STL := none
-
-# These don't actually link, but are required to get exported headers
-LOCAL_STATIC_LIBRARIES_linux := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_windows := libunwindbacktrace
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-#=====================================================================
-# Device Shared Library: libcompiler_rt
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcompiler_rt
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_WHOLE_STATIC_LIBRARIES := libcompiler_rt
-LOCAL_SHARED_LIBRARIES := libdl liblog
-LOCAL_STATIC_LIBRARIES := liblzma
-LOCAL_STATIC_LIBRARIES_arm := libunwind_llvm
-LOCAL_STATIC_LIBRARIES_arm64 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_mips := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_mips64 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_x86 := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_x86_64 := libunwindbacktrace
-LOCAL_LDFLAGS_arm := -Wl,--exclude-libs,libunwind_llvm.a
-LOCAL_LDFLAGS_arm64 := -Wl,--exclude-libs,libunwindbacktrace.a
-LOCAL_LDFLAGS_mips := -Wl,--exclude-libs,libunwindbacktrace.a
-LOCAL_LDFLAGS_mips64 := -Wl,--exclude-libs,libunwindbacktrace.a
-LOCAL_LDFLAGS_x86 := -Wl,--exclude-libs,libunwindbacktrace.a
-LOCAL_LDFLAGS_x86_64 := -Wl,--exclude-libs,libunwindbacktrace.a
-LOCAL_MODULE_TARGET_ARCH := arm arm64 mips mips64 x86 x86_64
-LOCAL_SANITIZE := never
-LOCAL_CXX_STL := none
-LOCAL_NO_LIBGCC := true
-
-include $(BUILD_SHARED_LIBRARY)
-
-#=====================================================================
-# Host Shared Library: libcompiler_rt
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libcompiler_rt
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_WHOLE_STATIC_LIBRARIES := libcompiler_rt
-LOCAL_STATIC_LIBRARIES_linux := libunwindbacktrace
-LOCAL_STATIC_LIBRARIES_windows := libunwindbacktrace
-LOCAL_CPPFLAGS := -nostdinc++
-LOCAL_LDFLAGS_darwin := -nodefaultlibs
-LOCAL_LDFLAGS_linux := -nodefaultlibs
-LOCAL_LDLIBS_darwin := -lpthread -lc -lm
-LOCAL_LDLIBS_linux := -lpthread -lc -lm
-LOCAL_MULTILIB := both
-LOCAL_SANITIZE := never
-LOCAL_CXX_STL := none
-LOCAL_NO_LIBGCC := true
-
-include $(BUILD_HOST_SHARED_LIBRARY)
-
-# Build asan, lsan, etc.
-include $(call all-makefiles-under,$(LOCAL_PATH)/lib)
-
-endif
diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk
deleted file mode 100644
index a024e66..0000000
--- a/lib/asan/Android.mk
+++ /dev/null
@@ -1,332 +0,0 @@
-#
-# Copyright (C) 2012 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-ASAN_NEEDS_SEGV=0
-ASAN_HAS_EXCEPTIONS=1
-ASAN_FLEXIBLE_MAPPING_AND_OFFSET=0
-
-asan_rtl_files := \
- asan_activation.cc \
- asan_allocator.cc \
- asan_fake_stack.cc \
- asan_flags.cc \
- asan_globals.cc \
- asan_interceptors.cc \
- asan_linux.cc \
- asan_mac.cc \
- asan_malloc_linux.cc \
- asan_malloc_mac.cc \
- asan_malloc_win.cc \
- asan_poisoning.cc \
- asan_posix.cc \
- asan_report.cc \
- asan_rtl.cc \
- asan_stack.cc \
- asan_stats.cc \
- asan_suppressions.cc \
- asan_thread.cc \
- asan_win.cc \
- ../interception/interception_linux.cc \
- ../lsan/lsan_common.cc \
- ../lsan/lsan_common_linux.cc \
- ../sanitizer_common/sanitizer_allocator.cc \
- ../sanitizer_common/sanitizer_common.cc \
- ../sanitizer_common/sanitizer_common_libcdep.cc \
- ../sanitizer_common/sanitizer_coverage_libcdep.cc \
- ../sanitizer_common/sanitizer_coverage_mapping_libcdep.cc \
- ../sanitizer_common/sanitizer_deadlock_detector1.cc \
- ../sanitizer_common/sanitizer_deadlock_detector2.cc \
- ../sanitizer_common/sanitizer_flags.cc \
- ../sanitizer_common/sanitizer_flag_parser.cc \
- ../sanitizer_common/sanitizer_libc.cc \
- ../sanitizer_common/sanitizer_libignore.cc \
- ../sanitizer_common/sanitizer_linux.cc \
- ../sanitizer_common/sanitizer_linux_libcdep.cc \
- ../sanitizer_common/sanitizer_mac.cc \
- ../sanitizer_common/sanitizer_persistent_allocator.cc \
- ../sanitizer_common/sanitizer_platform_limits_linux.cc \
- ../sanitizer_common/sanitizer_platform_limits_posix.cc \
- ../sanitizer_common/sanitizer_posix.cc \
- ../sanitizer_common/sanitizer_posix_libcdep.cc \
- ../sanitizer_common/sanitizer_printf.cc \
- ../sanitizer_common/sanitizer_procmaps_common.cc \
- ../sanitizer_common/sanitizer_procmaps_freebsd.cc \
- ../sanitizer_common/sanitizer_procmaps_linux.cc \
- ../sanitizer_common/sanitizer_procmaps_mac.cc \
- ../sanitizer_common/sanitizer_stackdepot.cc \
- ../sanitizer_common/sanitizer_stacktrace.cc \
- ../sanitizer_common/sanitizer_stacktrace_libcdep.cc \
- ../sanitizer_common/sanitizer_stacktrace_printer.cc \
- ../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc \
- ../sanitizer_common/sanitizer_suppressions.cc \
- ../sanitizer_common/sanitizer_symbolizer.cc \
- ../sanitizer_common/sanitizer_symbolizer_libbacktrace.cc \
- ../sanitizer_common/sanitizer_symbolizer_libcdep.cc \
- ../sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc \
- ../sanitizer_common/sanitizer_symbolizer_win.cc \
- ../sanitizer_common/sanitizer_thread_registry.cc \
- ../sanitizer_common/sanitizer_tls_get_addr.cc \
- ../sanitizer_common/sanitizer_unwind_linux_libcdep.cc \
- ../sanitizer_common/sanitizer_win.cc \
-
-asan_rtl_cxx_files := \
- asan_new_delete.cc \
-
-asan_rtl_cflags := \
- -fvisibility=hidden \
- -fno-exceptions \
- -DASAN_LOW_MEMORY=1 \
- -DASAN_NEEDS_SEGV=$(ASAN_NEEDS_SEGV) \
- -DASAN_HAS_EXCEPTIONS=$(ASAN_HAS_EXCEPTIONS) \
- -DASAN_FLEXIBLE_MAPPING_AND_OFFSET=$(ASAN_FLEXIBLE_MAPPING_AND_OFFSET) \
- -Wno-covered-switch-default \
- -Wno-non-virtual-dtor \
- -Wno-sign-compare \
- -Wno-unused-parameter \
- -std=c++11 \
- -fno-rtti \
- -fno-builtin
-
-asan_test_files := \
- tests/asan_globals_test.cc \
- tests/asan_test.cc
-
-#tests/asan_noinst_test.cc \
-#tests/asan_test_main.cc \
-
-asan_test_cflags := \
- -fsanitize-blacklist=external/compiler-rt/lib/asan/tests/asan_test.ignore \
- -DASAN_LOW_MEMORY=1 \
- -DASAN_UAR=0 \
- -DASAN_NEEDS_SEGV=$(ASAN_NEEDS_SEGV) \
- -DASAN_HAS_EXCEPTIONS=$(ASAN_HAS_EXCEPTIONS) \
- -DASAN_HAS_BLACKLIST=1 \
- -Wno-covered-switch-default \
- -Wno-non-virtual-dtor \
- -Wno-sign-compare \
- -Wno-unused-parameter \
- -std=c++11
-
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libasan
-LOCAL_C_INCLUDES := \
- external/compiler-rt/lib \
- external/compiler-rt/include
-LOCAL_CFLAGS += $(asan_rtl_cflags)
-# work around clang -O2 bug that affects mips64 asan_flags only:
-# https://dmz-portal.mips.com/bugz/show_bug.cgi?id=2275
-# Fixed with http://reviews.llvm.org/rL266203
-LOCAL_CFLAGS_mips64 += -O1
-LOCAL_SRC_FILES := asan_preinit.cc
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CLANG := true
-LOCAL_SANITIZE := never
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 mips mips64
-LOCAL_NDK_STL_VARIANT := none
-LOCAL_SDK_VERSION := 19
-include $(BUILD_STATIC_LIBRARY)
-
-define build-asan-rt-shared-library
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := $(1)
-LOCAL_MULTILIB := $(2)
-# This library must go on /system partition, even in SANITIZE_TARGET mode (when all libraries are
-# installed on /data). That's because /data may not be available until vold does some magic and
-# vold itself depends on this library.
-LOCAL_MODULE_PATH_32 := $(TARGET_OUT)/lib
-LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
-# We need to unwind by frame pointers through a small portion of ASan runtime library code,
-# and that only works with ARM, not with Thumb.
-LOCAL_ARM_MODE := arm
-LOCAL_C_INCLUDES := \
- external/compiler-rt/lib \
- external/compiler-rt/include
-LOCAL_CFLAGS += $(asan_rtl_cflags)
-# work around clang -O2 bug that affects mips64 asan_flags only:
-# https://dmz-portal.mips.com/bugz/show_bug.cgi?id=2275
-# Fixed with http://reviews.llvm.org/rL266203
-LOCAL_CFLAGS_mips64 += -O1
-LOCAL_SRC_FILES := $(asan_rtl_files) $(asan_rtl_cxx_files)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_LDLIBS := -llog -ldl
-LOCAL_STATIC_LIBRARIES := libubsan
-# MacOS toolchain is out-of-date and does not support -z global.
-# TODO: re-enable once the toolchain issue is fixed.
-ifneq ($(HOST_OS),darwin)
- LOCAL_LDFLAGS += -Wl,-z,global
-endif
-LOCAL_CLANG := true
-LOCAL_SANITIZE := never
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 mips mips64
-LOCAL_NDK_STL_VARIANT := none
-LOCAL_SDK_VERSION := 19
-include $(BUILD_SHARED_LIBRARY)
-
-endef
-
-ifeq (true,$(FORCE_BUILD_SANITIZER_SHARED_OBJECTS))
-ifdef 2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY
- $(eval $(call build-asan-rt-shared-library,$(ADDRESS_SANITIZER_RUNTIME_LIBRARY),64))
- $(eval $(call build-asan-rt-shared-library,$(2ND_ADDRESS_SANITIZER_RUNTIME_LIBRARY),32))
-else
- $(eval $(call build-asan-rt-shared-library,$(ADDRESS_SANITIZER_RUNTIME_LIBRARY),32))
-endif
-endif
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := asanwrapper
-LOCAL_SRC_FILES := asanwrapper.cc
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CPPFLAGS := -std=c++11
-LOCAL_SANITIZE := never
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 mips mips64
-LOCAL_CXX_STL := libc++
-
-include $(BUILD_EXECUTABLE)
-
-ifneq (true,$(SKIP_LLVM_TESTS))
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := libasan_noinst_test
-LOCAL_MODULE_TAGS := tests
-LOCAL_C_INCLUDES := \
- external/compiler-rt/include \
- external/compiler-rt/lib \
- external/compiler-rt/lib/asan/tests \
- external/compiler-rt/lib/sanitizer_common/tests
-LOCAL_CFLAGS += \
- -Wno-non-virtual-dtor \
- -Wno-unused-parameter \
- -Wno-sign-compare \
- -DASAN_UAR=0 \
- -DASAN_HAS_BLACKLIST=1 \
- -DASAN_HAS_EXCEPTIONS=$(ASAN_HAS_EXCEPTIONS) \
- -DASAN_NEEDS_SEGV=$(ASAN_NEEDS_SEGV) \
- -std=c++11
-LOCAL_SRC_FILES := tests/asan_noinst_test.cc tests/asan_test_main.cc
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CLANG := true
-LOCAL_SANITIZE := never
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 mips mips64
-LOCAL_CXX_STL := libc++
-
-include $(BUILD_STATIC_TEST_LIBRARY)
-
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := asan_test
-LOCAL_MODULE_TAGS := tests
-LOCAL_C_INCLUDES := \
- external/compiler-rt/lib \
- external/compiler-rt/lib/asan/tests \
- external/compiler-rt/lib/sanitizer_common/tests
-LOCAL_CFLAGS += $(asan_test_cflags)
-LOCAL_SRC_FILES := $(asan_test_files)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_STATIC_LIBRARIES := libasan_noinst_test
-LOCAL_SHARED_LIBRARIES := libc
-LOCAL_SANITIZE := address
-LOCAL_CLANG := true
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 mips mips64
-LOCAL_CXX_STL := libc++
-
-include $(BUILD_NATIVE_TEST)
-
-endif # SKIP_LLVM_TESTS
-
-################################################################################
-# Host modules
-
-ifneq ($(HOST_OS),darwin)
-include $(CLEAR_VARS)
-LOCAL_MODULE := libasan
-LOCAL_C_INCLUDES := external/compiler-rt/lib external/compiler-rt/include
-LOCAL_CFLAGS += $(asan_rtl_cflags)
-LOCAL_SRC_FILES := $(asan_rtl_files)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CLANG := true
-LOCAL_MULTILIB := both
-LOCAL_SANITIZE := never
-LOCAL_WHOLE_STATIC_LIBRARIES := libubsan
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libasan_cxx
-LOCAL_C_INCLUDES := external/compiler-rt/lib external/compiler-rt/include
-LOCAL_CFLAGS += $(asan_rtl_cflags)
-LOCAL_SRC_FILES := $(asan_rtl_cxx_files)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CLANG := true
-LOCAL_MULTILIB := both
-LOCAL_SANITIZE := never
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-ifneq (true,$(SKIP_LLVM_TESTS))
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libasan_noinst_test
-LOCAL_MODULE_TAGS := tests
-LOCAL_C_INCLUDES := \
- external/compiler-rt/include \
- external/compiler-rt/lib \
- external/compiler-rt/lib/asan/tests \
- external/compiler-rt/lib/sanitizer_common/tests
-LOCAL_CFLAGS += \
- -Wno-unused-parameter \
- -Wno-sign-compare \
- -DASAN_UAR=0 \
- -DASAN_HAS_BLACKLIST=1 \
- -DASAN_HAS_EXCEPTIONS=$(ASAN_HAS_EXCEPTIONS) \
- -DASAN_NEEDS_SEGV=$(ASAN_NEEDS_SEGV) \
- -std=c++11
-LOCAL_SRC_FILES := tests/asan_noinst_test.cc tests/asan_test_main.cc
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_CLANG := true
-LOCAL_CXX_STL := libc++
-LOCAL_MULTILIB := both
-LOCAL_SANITIZE := never
-include $(BUILD_HOST_STATIC_TEST_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := asan_test
-LOCAL_MODULE_TAGS := tests
-LOCAL_C_INCLUDES := \
- external/compiler-rt/lib \
- external/compiler-rt/lib/asan/tests \
- external/compiler-rt/lib/sanitizer_common/tests
-LOCAL_CFLAGS += $(asan_test_cflags)
-LOCAL_SRC_FILES := $(asan_test_files)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_STATIC_LIBRARIES := libasan_noinst_test
-LOCAL_SANITIZE := address
-LOCAL_CLANG := true
-LOCAL_CXX_STL := libc++
-LOCAL_MULTILIB := both
-LOCAL_LDLIBS := -lrt
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-include $(BUILD_HOST_NATIVE_TEST)
-endif # SKIP_LLVM_TESTS
-endif
diff --git a/lib/interception/Android.mk b/lib/interception/Android.mk
deleted file mode 100644
index 10270ec..0000000
--- a/lib/interception/Android.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-interception_src_files := \
- interception_linux.cc \
- interception_mac.cc \
- interception_type_test.cc \
- interception_win.cc \
-
-interception_cppflags := \
- -fvisibility=hidden \
- -fno-exceptions \
- -std=c++11 \
- -Wall \
- -Werror \
- -Wno-unused-parameter \
-
-interception_c_includes := \
- external/compiler-rt/lib \
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libinterception
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(interception_c_includes)
-LOCAL_CPPFLAGS := $(interception_cppflags)
-LOCAL_SRC_FILES := $(interception_src_files)
-LOCAL_CXX_STL := none
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/profile/Android.mk b/lib/profile/Android.mk
deleted file mode 100644
index fc39c5b..0000000
--- a/lib/profile/Android.mk
+++ /dev/null
@@ -1,64 +0,0 @@
-#
-# Copyright (C) 2016 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH := $(call my-dir)
-
-libprofile_rt_srcs := \
- GCDAProfiling.c \
- InstrProfiling.c \
- InstrProfilingBuffer.c \
- InstrProfilingFile.c \
- InstrProfilingPlatformDarwin.c \
- InstrProfilingPlatformOther.c \
- InstrProfilingRuntime.cc \
- InstrProfilingUtil.c \
-
-libprofile_rt_cflags := -Werror -Wall
-
-#=====================================================================
-# Host Static Library: libprofile_rt
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE = libprofile_rt
-LOCAL_CFLAGS := $(libcompiler_rt_cflags)
-LOCAL_SRC_FILES := $(libprofile_rt_srcs)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-LOCAL_CXX_STL := none
-
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-#=====================================================================
-# Device Static Library: libprofile_rt
-#=====================================================================
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE = libprofile_rt
-LOCAL_CFLAGS := $(libcompiler_rt_cflags)
-LOCAL_CLANG := true
-LOCAL_SRC_FILES := $(libprofile_rt_srcs)
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-LOCAL_NDK_STL_VARIANT := none
-LOCAL_SDK_VERSION := 21
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/lib/sanitizer_common/Android.mk b/lib/sanitizer_common/Android.mk
deleted file mode 100644
index bea9e0c..0000000
--- a/lib/sanitizer_common/Android.mk
+++ /dev/null
@@ -1,94 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-san_rtl_files := \
- sanitizer_allocator.cc \
- sanitizer_common.cc \
- sanitizer_deadlock_detector1.cc \
- sanitizer_deadlock_detector2.cc \
- sanitizer_flags.cc \
- sanitizer_flag_parser.cc \
- sanitizer_libc.cc \
- sanitizer_libignore.cc \
- sanitizer_linux.cc \
- sanitizer_mac.cc \
- sanitizer_persistent_allocator.cc \
- sanitizer_platform_limits_linux.cc \
- sanitizer_platform_limits_posix.cc \
- sanitizer_posix.cc \
- sanitizer_printf.cc \
- sanitizer_procmaps_common.cc \
- sanitizer_procmaps_freebsd.cc \
- sanitizer_procmaps_linux.cc \
- sanitizer_procmaps_mac.cc \
- sanitizer_stackdepot.cc \
- sanitizer_stacktrace.cc \
- sanitizer_stacktrace_printer.cc \
- sanitizer_suppressions.cc \
- sanitizer_symbolizer.cc \
- sanitizer_symbolizer_libbacktrace.cc \
- sanitizer_symbolizer_win.cc \
- sanitizer_tls_get_addr.cc \
- sanitizer_thread_registry.cc \
- sanitizer_win.cc \
-
-san_cdep_files := \
- sanitizer_common_libcdep.cc \
- sanitizer_coverage_libcdep.cc \
- sanitizer_coverage_mapping_libcdep.cc \
- sanitizer_linux_libcdep.cc \
- sanitizer_posix_libcdep.cc \
- sanitizer_stacktrace_libcdep.cc \
- sanitizer_stoptheworld_linux_libcdep.cc \
- sanitizer_symbolizer_libcdep.cc \
- sanitizer_symbolizer_posix_libcdep.cc \
- sanitizer_unwind_linux_libcdep.cc \
-
-san_rtl_cppflags := \
- -fvisibility=hidden \
- -fno-exceptions \
- -std=c++11 \
- -Wall \
- -Werror \
- -Wno-unused-parameter \
-
-san_rtl_c_includes := \
- external/compiler-rt/lib \
-
-################################################################################
-# Host modules
-
-ifneq ($(HOST_OS),darwin)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libsan
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(san_rtl_c_includes)
-LOCAL_CPPFLAGS := $(san_rtl_cppflags)
-LOCAL_SRC_FILES := $(san_rtl_files) $(san_cdep_files)
-LOCAL_CXX_STL := none
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
-
-ifndef SANITIZE_HOST
-include $(LOCAL_PATH)/tests/Android.mk
-endif
diff --git a/lib/sanitizer_common/tests/Android.mk b/lib/sanitizer_common/tests/Android.mk
deleted file mode 100644
index fe6a90d..0000000
--- a/lib/sanitizer_common/tests/Android.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-san_test_files := \
- sanitizer_allocator_test.cc \
- sanitizer_atomic_test.cc \
- sanitizer_bitvector_test.cc \
- sanitizer_bvgraph_test.cc \
- sanitizer_common_test.cc \
- sanitizer_deadlock_detector_test.cc \
- sanitizer_flags_test.cc \
- sanitizer_format_interceptor_test.cc \
- sanitizer_ioctl_test.cc \
- sanitizer_libc_test.cc \
- sanitizer_linux_test.cc \
- sanitizer_list_test.cc \
- sanitizer_mutex_test.cc \
- sanitizer_nolibc_test.cc \
- sanitizer_posix_test.cc \
- sanitizer_printf_test.cc \
- sanitizer_procmaps_test.cc \
- sanitizer_stackdepot_test.cc \
- sanitizer_stacktrace_printer_test.cc \
- sanitizer_stacktrace_test.cc \
- sanitizer_stoptheworld_test.cc \
- sanitizer_suppressions_test.cc \
- sanitizer_test_main.cc \
- sanitizer_thread_registry_test.cc \
-
-san_test_cppflags := \
- -fvisibility=hidden \
- -fno-exceptions \
- -fno-rtti \
- -std=c++11 \
- -Wall \
- -Werror \
- -Wno-unused-parameter \
- -Wno-non-virtual-dtor \
-
-san_test_c_includes := \
- external/compiler-rt/lib \
-
-ifneq ($(HOST_OS),darwin)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := san_test
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(san_test_c_includes)
-LOCAL_CPPFLAGS := $(san_test_cppflags)
-LOCAL_SRC_FILES := $(san_test_files)
-LOCAL_STATIC_LIBRARIES := libsan
-LOCAL_LDLIBS := -ldl -lrt
-LOCAL_SANITIZE := never
-include $(BUILD_HOST_NATIVE_TEST)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := san_test-Nolibc
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(san_test_c_includes) external/gtest/include
-LOCAL_CPPFLAGS := $(san_test_cppflags)
-LOCAL_SRC_FILES := sanitizer_nolibc_test_main.cc
-LOCAL_STATIC_LIBRARIES := libsan libgtest_host
-LOCAL_LDFLAGS := -nostdlib -Qunused-arguments
-LOCAL_LDLIBS := -ldl -lrt
-LOCAL_SANITIZE := never
-include $(BUILD_HOST_EXECUTABLE)
-
-endif
diff --git a/lib/tsan/Android.mk b/lib/tsan/Android.mk
deleted file mode 100644
index 0e483f0..0000000
--- a/lib/tsan/Android.mk
+++ /dev/null
@@ -1,144 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-ifeq ($(HOST_OS),linux)
-ifeq ($(HOST_ARCH),x86_64)
-
-tsan_rtl_files := \
- rtl/tsan_clock.cc \
- rtl/tsan_flags.cc \
- rtl/tsan_fd.cc \
- rtl/tsan_ignoreset.cc \
- rtl/tsan_interceptors.cc \
- rtl/tsan_interface_ann.cc \
- rtl/tsan_interface_atomic.cc \
- rtl/tsan_interface.cc \
- rtl/tsan_interface_java.cc \
- rtl/tsan_md5.cc \
- rtl/tsan_mman.cc \
- rtl/tsan_mutex.cc \
- rtl/tsan_mutexset.cc \
- rtl/tsan_report.cc \
- rtl/tsan_rtl.cc \
- rtl/tsan_rtl_mutex.cc \
- rtl/tsan_rtl_report.cc \
- rtl/tsan_rtl_thread.cc \
- rtl/tsan_stack_trace.cc \
- rtl/tsan_stat.cc \
- rtl/tsan_suppressions.cc \
- rtl/tsan_symbolize.cc \
- rtl/tsan_sync.cc \
- rtl/tsan_platform_linux.cc \
- rtl/tsan_platform_posix.cc \
- rtl/tsan_rtl_amd64.S \
-
-tsan_rtl_cppflags := -std=c++11 -Wall -Werror -Wno-unused-parameter -Wno-non-virtual-dtor \
- -fno-rtti -fno-builtin
-
-tsan_rtl_c_includes := \
- $(LOCAL_PATH)/.. \
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libtsan
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(tsan_rtl_c_includes)
-LOCAL_CPPFLAGS := $(tsan_rtl_cppflags)
-LOCAL_SRC_FILES := $(tsan_rtl_files)
-LOCAL_CXX_STL := none
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := 64
-LOCAL_WHOLE_STATIC_LIBRARIES := libinterception libsan libubsan
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libtsan_cxx
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES = $(tsan_rtl_c_includes)
-LOCAL_CPPFLAGS := $(tsan_rtl_cppflags)
-LOCAL_SRC_FILES := rtl/tsan_new_delete.cc
-LOCAL_CXX_STL := none
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := 64
-LOCAL_WHOLE_STATIC_LIBRARIES := libubsan_cxx
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-tsan_unit_test_src_files := \
- tests/unit/tsan_clock_test.cc \
- tests/unit/tsan_dense_alloc_test.cc \
- tests/unit/tsan_flags_test.cc \
- tests/unit/tsan_mman_test.cc \
- tests/unit/tsan_mutex_test.cc \
- tests/unit/tsan_mutexset_test.cc \
- tests/unit/tsan_shadow_test.cc \
- tests/unit/tsan_stack_test.cc \
- tests/unit/tsan_sync_test.cc \
- tests/unit/tsan_unit_test_main.cc \
- tests/unit/tsan_vector_test.cc \
-
-tsan_unit_test_c_includes := \
- $(LOCAL_PATH)/rtl \
- $(LOCAL_PATH)/.. \
-
-ifneq (true,$(SKIP_LLVM_TESTS))
-ifndef SANITIZE_HOST
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libtsan_unit_test
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(tsan_unit_test_c_includes)
-LOCAL_CPPFLAGS := $(tsan_rtl_cppflags)
-LOCAL_SRC_FILES := $(tsan_unit_test_src_files)
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := 64
-LOCAL_STATIC_LIBRARIES := libtsan libubsan
-LOCAL_LDLIBS := -lrt -ldl
-include $(BUILD_HOST_NATIVE_TEST)
-
-
-tsan_rtl_test_src_files := \
- tests/rtl/tsan_bench.cc \
- tests/rtl/tsan_mop.cc \
- tests/rtl/tsan_mutex.cc \
- tests/rtl/tsan_posix.cc \
- tests/rtl/tsan_string.cc \
- tests/rtl/tsan_test_util_posix.cc \
- tests/rtl/tsan_test.cc \
- tests/rtl/tsan_thread.cc \
-
-tsan_rtl_test_c_includes := \
- $(LOCAL_PATH)/rtl \
- $(LOCAL_PATH)/.. \
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libtsan_rtl_test
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(tsan_rtl_test_c_includes)
-LOCAL_CPPFLAGS := $(tsan_rtl_cppflags)
-LOCAL_SRC_FILES := $(tsan_rtl_test_src_files)
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := 64
-LOCAL_STATIC_LIBRARIES := libtsan libubsan
-LOCAL_LDLIBS := -lrt -ldl
-include $(BUILD_HOST_NATIVE_TEST)
-
-endif # SANITIZE_HOST
-endif # SKIP_LLVM_TESTS
-
-endif # ifeq ($(HOST_ARCH),x86_64)
-endif # ifeq ($(HOST_OS),linux)
diff --git a/lib/ubsan/Android.mk b/lib/ubsan/Android.mk
deleted file mode 100644
index 04ff1b0..0000000
--- a/lib/ubsan/Android.mk
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (C) 2015 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-
-LOCAL_PATH:= $(call my-dir)
-
-ubsan_rtl_files := \
- ubsan_diag.cc \
- ubsan_init.cc \
- ubsan_flags.cc \
- ubsan_handlers.cc \
- ubsan_value.cc \
-
-ubsan_cxx_rtl_files := \
- ubsan_handlers_cxx.cc \
- ubsan_type_hash.cc \
- ubsan_type_hash_itanium.cc \
- ubsan_type_hash_win.cc \
-
-ubsan_rtl_cppflags := \
- -fvisibility=hidden \
- -fno-exceptions \
- -std=c++11 \
- -Wall \
- -Werror \
- -Wno-unused-parameter \
- -Wno-non-virtual-dtor \
-
-ubsan_rtl_c_includes := \
- external/compiler-rt/lib \
-
-################################################################################
-# Target modules
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libubsan
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(ubsan_rtl_c_includes)
-LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags)
-LOCAL_SRC_FILES := $(ubsan_rtl_files)
-LOCAL_NDK_STL_VARIANT := none
-LOCAL_SDK_VERSION := 19
-LOCAL_SANITIZE := never
-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 mips mips64
-LOCAL_MULTILIB := both
-include $(BUILD_STATIC_LIBRARY)
-
-################################################################################
-# Host modules
-
-ifneq ($(HOST_OS),darwin)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libubsan
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(ubsan_rtl_c_includes)
-LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags) -fno-rtti
-LOCAL_SRC_FILES := $(ubsan_rtl_files)
-LOCAL_CXX_STL := none
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libubsan_standalone
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(ubsan_rtl_c_includes)
-LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags) -fno-rtti
-LOCAL_SRC_FILES := $(ubsan_rtl_files)
-LOCAL_WHOLE_STATIC_LIBRARIES := libsan
-LOCAL_CXX_STL := none
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libubsan_cxx
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(ubsan_rtl_c_includes)
-LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags)
-LOCAL_SRC_FILES := $(ubsan_cxx_rtl_files)
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libubsan_standalone_cxx
-LOCAL_CPP_EXTENSION := .cc
-LOCAL_C_INCLUDES := $(ubsan_rtl_c_includes)
-LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags)
-LOCAL_SRC_FILES := $(ubsan_cxx_rtl_files)
-LOCAL_SANITIZE := never
-LOCAL_MULTILIB := both
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-endif
