diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-11-04 18:45:11 +0800 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2015-11-04 18:45:11 +0800 |
| commit | 683fd1c48c70358f32f7747a799aa6324bc03b52 (patch) | |
| tree | d83d76d7b465438ddb1fad23109e39065b68b1e4 | |
| parent | cf84e152c734af7762eaedd3829a247a2cd713f3 (diff) | |
| download | linaro-android-userspace-test-linaro-marshmallow.tar.gz | |
tremolo/amrnb/m4v_h263: fix problem for android-6.0.0_r26linaro-marshmallowRLCR-16.01RLCR-15.12
fix error like:
error: undefined reference to '__android_log_print'
since source in android-6.0.0_r26 starts to use liblog
Change-Id: If37fa472895fb2a1de12c13ec75abe66f4382fe9
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | audio-codec/tremolo/Android.mk | 6 | ||||
| -rw-r--r-- | speech-codec/amrnb/Android.mk | 5 | ||||
| -rw-r--r-- | video-codec/m4v_h263/Android.mk | 11 |
3 files changed, 10 insertions, 12 deletions
diff --git a/audio-codec/tremolo/Android.mk b/audio-codec/tremolo/Android.mk index ddaa2d1..dc56fff 100644 --- a/audio-codec/tremolo/Android.mk +++ b/audio-codec/tremolo/Android.mk @@ -58,7 +58,9 @@ LOCAL_C_INCLUDES += \ $(call include-path-for, audio-utils) LOCAL_STATIC_LIBRARIES := \ - libc libsndfile libvorbisidec libaudioprimitives + libsndfile libvorbisidec libaudioprimitives + +LOCAL_SHARED_LIBRARIES := liblog LOCAL_ARM_MODE := arm @@ -67,6 +69,4 @@ LOCAL_MODULE_TAGS := optional tests LOCAL_MULTILIB := 32 -LOCAL_FORCE_STATIC_EXECUTABLE := true - include $(BUILD_EXECUTABLE) diff --git a/speech-codec/amrnb/Android.mk b/speech-codec/amrnb/Android.mk index f8b481b..e6d5df3 100644 --- a/speech-codec/amrnb/Android.mk +++ b/speech-codec/amrnb/Android.mk @@ -90,16 +90,15 @@ LOCAL_C_INCLUDES := \ $(call include-path-for, audio-utils) LOCAL_STATIC_LIBRARIES := \ - libc libstagefright_amrnbdec libstagefright_amrnb_common_linaro \ + libstagefright_amrnbdec libstagefright_amrnb_common_linaro \ libsndfile libaudioprimitives +LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE := libstagefright_amrnbdec_test_linaro LOCAL_MODULE_TAGS := optional tests LOCAL_MULTILIB := 32 -LOCAL_FORCE_STATIC_EXECUTABLE := true - include $(BUILD_EXECUTABLE) ############################################################################## diff --git a/video-codec/m4v_h263/Android.mk b/video-codec/m4v_h263/Android.mk index a346b1f..dde192c 100644 --- a/video-codec/m4v_h263/Android.mk +++ b/video-codec/m4v_h263/Android.mk @@ -11,13 +11,12 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := -DOSCL_EXPORT_REF= -DOSCL_IMPORT_REF= -DBX_RC LOCAL_STATIC_LIBRARIES := \ - libc libstagefright_m4vh263enc libm + libstagefright_m4vh263enc libm +LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE := libstagefright_m4vh263enc_test LOCAL_MODULE_TAGS := optional tests -LOCAL_FORCE_STATIC_EXECUTABLE := true - include $(BUILD_EXECUTABLE) ############################################################################## @@ -34,11 +33,11 @@ LOCAL_C_INCLUDES := \ LOCAL_CFLAGS := -DOSCL_EXPORT_REF= -DOSCL_IMPORT_REF= LOCAL_STATIC_LIBRARIES := \ - libc libstagefright_m4vh263dec + libstagefright_m4vh263dec + +LOCAL_SHARED_LIBRARIES := liblog LOCAL_MODULE := libstagefright_m4vh263dec_test LOCAL_MODULE_TAGS := optional tests -LOCAL_FORCE_STATIC_EXECUTABLE := true - include $(BUILD_EXECUTABLE) |