commit 39fe56dbf5215316de8b8e0f3214c19e37e3158a
author Vishwath Mohan <vishwath@google.com> Tue Apr 18 18:24:51 2017 -0700
committer Vishwath Mohan <vishwath@google.com> Tue Apr 18 18:24:51 2017 -0700
tree 1c0aee06002f59a9b2439d46241b0b711054fd59
parent 444923dfbf5d94f3eb9206b6de1a2678aed810b9

Enable libclang_rt.ubsan_standalone-x86_64-android

Uncomments the x86_64 version of ubsan_standalone. This enabling CFI
for these builds.

Bug: 30227045
Test: lunch aosp_x86_64-eng && ENABLE_CFI=true m -j40 checkbuild
Change-Id: I06796044133e6878308e19872a0525f32b814ecb

Android.mk

diff --git a/Android.mk b/Android.mk
index eae9972..ddd4fbb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -94,17 +94,17 @@
 LOCAL_CXX_STL := none
 include $(BUILD_PREBUILT)
 
-#include $(CLEAR_VARS)
-#LOCAL_MODULE := libclang_rt.ubsan_standalone-x86_64-android
-#LOCAL_SRC_FILES := $(libclang_dir)/lib/linux/$(LOCAL_MODULE).so
-#LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-#LOCAL_MODULE_SUFFIX := .so
-#LOCAL_MODULE_TARGET_ARCH := x86_64
-#LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
-#LOCAL_SANITIZE := never
-#LOCAL_SYSTEM_SHARED_LIBRARIES :=
-#LOCAL_CXX_STL := none
-#include $(BUILD_PREBUILT)
+include $(CLEAR_VARS)
+LOCAL_MODULE := libclang_rt.ubsan_standalone-x86_64-android
+LOCAL_SRC_FILES := $(libclang_dir)/lib/linux/$(LOCAL_MODULE).so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_TARGET_ARCH := x86_64
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT)/lib64
+LOCAL_SANITIZE := never
+LOCAL_SYSTEM_SHARED_LIBRARIES :=
+LOCAL_CXX_STL := none
+include $(BUILD_PREBUILT)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := libclang_rt.ubsan_standalone-mips-android