Commit ef81adc7 authored Apr 18, 2017 by Vishwath Mohan

Enable CFI for the amrwbenc software encoder static lib.

Adds LOCAL_SANITIZE := cfi to the amrwbenc static library that is
included in libstagefright_soft_amrwbenc.so. This fixes a runtime
crash with the software encoder.

Bug: 30227045
Test: 'ENABLE_CFI=true m -j40' to build with CFI, then run a GCE AVD
instance that uses the software encoder.
Change-Id: I06721597527e31f33c12baaac4feb409a3fdd0bd

parent 1ceb2df2

media/libstagefright/codecs/amrwbenc/Android.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -102,7 +102,8 @@ LOCAL_C_INCLUDES := \
		$(LOCAL_PATH)/inc

		LOCAL_CFLAGS += -Werror
		#LOCAL_SANITIZE := signed-integer-overflow
		LOCAL_SANITIZE := cfi
		LOCAL_SANITIZE_DIAG := cfi

		include $(BUILD_STATIC_LIBRARY)