commit cfa3a9909a978e058f6887b9905ca241dc5e9bf7
author Dan Albert <danalbert@google.com> Mon Apr 27 10:02:31 2015 -0700
committer Feng Yu <feny@google.com> Wed Feb 15 12:49:27 2017 -0800
tree 0ef1772bbde48d2e3f8850a740a48369367eed81
parent 57a14c9a8621270b0e6c697dce28a9c453ebe55f

Recover from shift exponent ubsan failures. DO NOT MERGE.

Will need to be fixed upstream and pulled in.

Change-Id: I3dabc841dc62794e19d21c318aafda373aad43cc
(cherry picked from commit 16e7e53602f67517abbe18cfe3f9d7d01aed9d96)

Bug: 31987131
Bug: 29178923

Android.mksnapshot.mk

diff --git a/Android.mksnapshot.mk b/Android.mksnapshot.mk
index 9d07f53..f5377a8 100644
--- a/Android.mksnapshot.mk
+++ b/Android.mksnapshot.mk
@@ -119,6 +119,8 @@
 
 LOCAL_STATIC_LIBRARIES := liblog
 
+LOCAL_SANITIZE_RECOVER := shift-exponent
+
 include $(BUILD_HOST_EXECUTABLE)
 else
 $(warning mksnapshot.$(mksnapshot_arch): architecture $(mksnapshot_arch) not supported)