diff options
| author | Stephen Hines <srhines@google.com> | 2016-10-11 23:21:15 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2016-10-28 22:15:48 +0000 |
| commit | 3a1e6a6c6d906c27e69e3a5dd154d1aba09cbe9b (patch) | |
| tree | 6dada527a583b48fe56c9399ea2b947999517fe9 | |
| parent | 8b4a1f6c15c75b33694c364694d8611248b4a461 (diff) | |
| download | prebuilts_clang_host_linux-x86-ndk-r14-release.tar.gz prebuilts_clang_host_linux-x86-ndk-r14-release.tar.bz2 prebuilts_clang_host_linux-x86-ndk-r14-release.zip | |
Add proper prebuilts to actually install "asan-test".ndk-r14-beta2ndk-r14-beta1ndk-r14ndk-r14-release
Because asan_test depends on internal implementation details of ASan, so
we must use prebuilts whenever we update the platform's compiler. This
CL properly installs these new prebuilts as "asan-test" (note the
hyphen). When Soong has support for conditional builds, we can switch
this back to the underscore version, but right now this causes conflicts
with the Android.bp build rules for asan_test in compiler-rt.
Test: Build for all 6 ABI architectures, and verified proper prebuilts
are copied.
Change-Id: Ie85b37a1216d28ac212bf2c123b2f84bf1f1bffe
| -rw-r--r-- | Android.mk | 70 |
1 files changed, 70 insertions, 0 deletions
@@ -133,4 +133,74 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := LOCAL_CXX_STL := none include $(BUILD_PREBUILT) +# Also build/install the newest asan_test for each arch +# We rename it to asan-test for now to avoid duplicate definitions. + +include $(CLEAR_VARS) +LOCAL_MODULE := asan-test +LOCAL_SRC_FILES := $(LLVM_PREBUILTS_VERSION)/test/arm/bin/asan_test +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_SUFFIX := +LOCAL_MODULE_PATH := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE_TARGET_ARCH := arm +LOCAL_SANITIZE := never +LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_CXX_STL := none +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := asan-test +LOCAL_SRC_FILES := $(LLVM_PREBUILTS_VERSION)/test/aarch64/bin/asan_test +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_SUFFIX := +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE_TARGET_ARCH := arm64 +LOCAL_SANITIZE := never +LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_CXX_STL := none +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := asan-test +LOCAL_SRC_FILES := $(LLVM_PREBUILTS_VERSION)/test/i686/bin/asan_test +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_SUFFIX := +LOCAL_MODULE_PATH := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE_TARGET_ARCH := x86 +LOCAL_SANITIZE := never +LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_CXX_STL := none +include $(BUILD_PREBUILT) + +# There is no x86_64 prebuilt here yet. + +include $(CLEAR_VARS) +LOCAL_MODULE := asan-test +LOCAL_SRC_FILES := $(LLVM_PREBUILTS_VERSION)/test/mips/bin/asan_test +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_SUFFIX := +LOCAL_MODULE_PATH := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE_TARGET_ARCH := mips +LOCAL_SANITIZE := never +LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_CXX_STL := none +include $(BUILD_PREBUILT) + +include $(CLEAR_VARS) +LOCAL_MODULE := asan-test +LOCAL_SRC_FILES := $(LLVM_PREBUILTS_VERSION)/test/mips64/bin/asan_test +LOCAL_MODULE_CLASS := EXECUTABLES +LOCAL_MODULE_SUFFIX := +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE) +LOCAL_MODULE_TAGS := debug +LOCAL_MODULE_TARGET_ARCH := mips64 +LOCAL_SANITIZE := never +LOCAL_SYSTEM_SHARED_LIBRARIES := +LOCAL_CXX_STL := none +include $(BUILD_PREBUILT) + endif |