3 files changed, 22 insertions, 0 deletions
diff --git a/compiler-rt/lib/asan/CMakeLists.txt b/compiler-rt/lib/asan/CMakeLists.txt
index d626d3b488e..1325a77a032 100644
--- a/compiler-rt/lib/asan/CMakeLists.txt
+++ b/compiler-rt/lib/asan/CMakeLists.txt
@@ -94,6 +94,17 @@ else()
       )
     list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-i386)
   endif()
+  if(CAN_TARGET_ARM_ANDROID)
+    add_library(clang_rt.asan-arm-android STATIC
+      ${ASAN_SOURCES}
+      $<TARGET_OBJECTS:RTInterception.arm.android>
+      $<TARGET_OBJECTS:RTSanitizerCommon.arm.android>
+      )
+    set_target_compile_flags(clang_rt.asan-arm-android
+      ${ASAN_CFLAGS} ${TARGET_ARM_ANDROID_CFLAGS}
+      )
+    list(APPEND ASAN_RUNTIME_LIBRARIES clang_rt.asan-arm-android)
+  endif()
 endif()
 
 set_property(TARGET ${ASAN_RUNTIME_LIBRARIES} APPEND PROPERTY
diff --git a/compiler-rt/lib/interception/CMakeLists.txt b/compiler-rt/lib/interception/CMakeLists.txt
index aacecf9b8b0..55046e91a28 100644
--- a/compiler-rt/lib/interception/CMakeLists.txt
+++ b/compiler-rt/lib/interception/CMakeLists.txt
@@ -43,4 +43,9 @@ else()
     set_target_compile_flags(RTInterception.i386
       ${INTERCEPTION_CFLAGS} ${TARGET_I386_CFLAGS})
   endif()
+  if(CAN_TARGET_ARM_ANDROID)
+    add_library(RTInterception.arm.android OBJECT ${INTERCEPTION_SOURCES})
+    set_target_compile_flags(RTInterception.arm.android
+      ${INTERCEPTION_CFLAGS} ${TARGET_ARM_ANDROID_CFLAGS})
+  endif()
 endif()
diff --git a/compiler-rt/lib/sanitizer_common/CMakeLists.txt b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
index 5ac8e3b8740..d8ea7c8a74e 100644
--- a/compiler-rt/lib/sanitizer_common/CMakeLists.txt
+++ b/compiler-rt/lib/sanitizer_common/CMakeLists.txt
@@ -50,6 +50,12 @@ else()
       ${SANITIZER_CFLAGS} ${TARGET_I386_CFLAGS})
     list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.i386)
   endif()
+  if(CAN_TARGET_ARM_ANDROID)
+    add_library(RTSanitizerCommon.arm.android OBJECT ${SANITIZER_SOURCES})
+    set_target_compile_flags(RTSanitizerCommon.arm.android
+      ${SANITIZER_CFLAGS} ${TARGET_ARM_ANDROID_CFLAGS})
+    list(APPEND SANITIZER_RUNTIME_LIBRARIES RTSanitizerCommon.arm.android)
+  endif()
 endif()
 
 set_property(TARGET ${SANITIZER_RUNTIME_LIBRARIES} APPEND PROPERTY