Commit 5a46e4e1 authored Oct 07, 2014 by Chih-Hung Hsieh Committed by Android Git Automerger Oct 07, 2014

am 2d15fb26: am 566a6fba: am ae38d425: Merge "Add -no-integrated-as at local level."

* commit '2d15fb26':
  Add -no-integrated-as at local level.

media/libstagefright/codecs/amrwbenc/Android.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -86,6 +86,9 @@ LOCAL_SRC_FILES += \

		endif

		# ARMV5E/Filt_6k_7k_opt.s does not compile with Clang.
		LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as

		LOCAL_MODULE := libstagefright_amrwbenc

		LOCAL_ARM_MODE := arm