Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485f7beb authored Apr 13, 2017 by Vishwath Mohan

Enable CFI for more components.

Enables CFI for libmediaplayerservice, and for the testid3 and
mediafilter executables.

Bug: 30227045
Test: ENABLE_CFI=true m -j40 builds and boots
Test: Media CTS tests pass, testid3 and mediafilter work correctly
Change-Id: If4cbca00157d5dd63c55a1379cfd83b926f56dbe
(cherry picked from commit eb332408)

parent 6d97f716

cmds/stagefright/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -185,6 +185,9 @@ LOCAL_MODULE_TAGS := optional

		LOCAL_MODULE:= mediafilter

		LOCAL_SANITIZE := cfi
		LOCAL_SANITIZE_DIAG := cfi

		include $(BUILD_EXECUTABLE)

		################################################################################

media/libmediaplayerservice/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -65,6 +65,9 @@ LOCAL_MODULE:= libmediaplayerservice

		LOCAL_32_BIT_ONLY := true

		LOCAL_SANITIZE := cfi
		LOCAL_SANITIZE_DIAG := cfi

		include $(BUILD_SHARED_LIBRARY)

		include $(call all-makefiles-under,$(LOCAL_PATH))

media/libstagefright/id3/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -33,4 +33,7 @@ LOCAL_MODULE_TAGS := optional

		LOCAL_MODULE := testid3

		LOCAL_SANITIZE := cfi
		LOCAL_SANITIZE_DIAG := cfi

		include $(BUILD_EXECUTABLE)