diff options
| author | Zhizhou Tian <zhizhou.tian@linaro.org> | 2015-08-19 09:29:14 +0100 |
|---|---|---|
| committer | Zhizhou Tian <zhizhou.tian@linaro.org> | 2015-08-19 09:27:49 +0000 |
| commit | 28e3ccfcd4c99d7a0c0a026c4cd6036f9134529d (patch) | |
| tree | bdbffa731ad7e2229f8aac3bf9840b2cd11ddd4e | |
| parent | fc41e432f8e72c7cea3a3d80f732535c97b83ee7 (diff) | |
| download | linaro-android-userspace-test-28e3ccfcd4c99d7a0c0a026c4cd6036f9134529d.tar.gz | |
Fix build error caused by redefine LOCAL_MODULE in linaro-android-userspace-test
Signed-off-by: Zhizhou Tian <zhizhou.tian@linaro.org>
Change-Id: I817f51253715488fcc3829b2da7a291500ef0229
| -rw-r--r-- | speech-codec/amrwb/Android.mk | 23 | ||||
| -rw-r--r-- | video-codec/avc/Android.mk | 26 |
2 files changed, 0 insertions, 49 deletions
diff --git a/speech-codec/amrwb/Android.mk b/speech-codec/amrwb/Android.mk index 6620fc9..bff2a99 100644 --- a/speech-codec/amrwb/Android.mk +++ b/speech-codec/amrwb/Android.mk @@ -1,28 +1,5 @@ CUR_WD := $(call my-dir) LOCAL_PATH := $(CUR_WD) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - amrwbdec_test.cpp - -LOCAL_C_INCLUDES := \ - frameworks/av/media/libstagefright/codecs/amrwb/src \ - frameworks/av/media/libstagefright/codecs/amrwb/include \ - $(call include-path-for, audio-utils) - -LOCAL_STATIC_LIBRARIES := \ - libc libstagefright_amrwbdec libsndfile libaudioprimitives - -LOCAL_MODULE := libstagefright_amrwbdec_test -LOCAL_MODULE_TAGS := optional tests - -LOCAL_MULTILIB := 32 - -LOCAL_FORCE_STATIC_EXECUTABLE := true - -include $(BUILD_EXECUTABLE) - -############################################################################## LOCAL_PATH := $(CUR_WD)/../../../../frameworks/av/media/libstagefright/codecs include $(CLEAR_VARS) diff --git a/video-codec/avc/Android.mk b/video-codec/avc/Android.mk index 7b5aaa6..364d4ac 100644 --- a/video-codec/avc/Android.mk +++ b/video-codec/avc/Android.mk @@ -24,32 +24,6 @@ include $(BUILD_STATIC_LIBRARY) ############################################################################## -LOCAL_PATH := $(CUR_WD) -include $(CLEAR_VARS) - -LOCAL_SRC_FILES := \ - h264_enc_test.cpp - -LOCAL_C_INCLUDES := \ - frameworks/av/media/libstagefright/codecs/avc/enc/src \ - frameworks/av/media/libstagefright/codecs/avc/enc/include \ - frameworks/av/media/libstagefright/codecs/avc/common/include \ - frameworks/av/media/libstagefright/codecs/avc/common - -LOCAL_CFLAGS := -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF= - -LOCAL_STATIC_LIBRARIES := \ - libc libstagefright_avcenc libstagefright_avc_common libm - -LOCAL_MODULE := libstagefright_h264enc_test -LOCAL_MODULE_TAGS := optional tests - -LOCAL_FORCE_STATIC_EXECUTABLE := true - -include $(BUILD_EXECUTABLE) - -############################################################################## - LOCAL_PATH := $(CUR_WD)/../../../../frameworks/av/media/libstagefright/codecs/on2/h264dec include $(CLEAR_VARS) |