diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-28 12:44:28 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-28 12:44:28 -0400 |
| commit | 731c32872f0ab03fa634da80d60304a3c804fbca (patch) | |
| tree | 6b51d53110f32ab21620ae68a15a7c9922a9ae35 /omx | |
| parent | 69ee5a12119752a668f27361d6bccb4d8bfee3f0 (diff) | |
| parent | 083eb0aba49b6b8dc04c097333d411ae133a4f0b (diff) | |
| download | omap3-731c32872f0ab03fa634da80d60304a3c804fbca.tar.gz | |
Merge change 27247 into eclair
* changes:
Don't build the TI OMX test binaries by default In addition, do not build the audio decoders, jpeg decoder, and VPP.
Diffstat (limited to 'omx')
22 files changed, 51 insertions, 9 deletions
diff --git a/omx/audio/src/openmax_il/aac_dec/src/Android.mk b/omx/audio/src/openmax_il/aac_dec/src/Android.mk index 632e55a..834bdb6 100644 --- a/omx/audio/src/openmax_il/aac_dec/src/Android.mk +++ b/omx/audio/src/openmax_il/aac_dec/src/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_AAC_DECODER),1) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -27,3 +28,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMAP_2430 LOCAL_MODULE:= libOMX.TI.AAC.decode include $(BUILD_SHARED_LIBRARY) +endif diff --git a/omx/audio/src/openmax_il/aac_enc/tests/Android.mk b/omx/audio/src/openmax_il/aac_enc/tests/Android.mk index 977007f..f3da9a4 100644 --- a/omx/audio/src/openmax_il/aac_enc/tests/Android.mk +++ b/omx/audio/src/openmax_il/aac_enc/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_AAC_ENC_TEST),1)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -19,3 +20,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= AacEncoder_Test
include $(BUILD_EXECUTABLE)
+endif
diff --git a/omx/audio/src/openmax_il/g711_dec/tests/Android.mk b/omx/audio/src/openmax_il/g711_dec/tests/Android.mk index 6e85aef..b28b29a 100755 --- a/omx/audio/src/openmax_il/g711_dec/tests/Android.mk +++ b/omx/audio/src/openmax_il/g711_dec/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G711_DEC_TEST),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -20,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G711Decoder_Test
include $(BUILD_EXECUTABLE)
+endif diff --git a/omx/audio/src/openmax_il/g711_enc/tests/Android.mk b/omx/audio/src/openmax_il/g711_enc/tests/Android.mk index 3b0a1e7..8d3e109 100755 --- a/omx/audio/src/openmax_il/g711_enc/tests/Android.mk +++ b/omx/audio/src/openmax_il/g711_enc/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G711_ENC_TEST),1)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -19,3 +20,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G711EncTest
include $(BUILD_EXECUTABLE)
+endif
diff --git a/omx/audio/src/openmax_il/g722_dec/tests/Android.mk b/omx/audio/src/openmax_il/g722_dec/tests/Android.mk index 85d3371..6a0a827 100755 --- a/omx/audio/src/openmax_il/g722_dec/tests/Android.mk +++ b/omx/audio/src/openmax_il/g722_dec/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G722_DEC_TEST),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -20,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G722Decoder_Test
include $(BUILD_EXECUTABLE)
+endif diff --git a/omx/audio/src/openmax_il/g722_enc/tests/Android.mk b/omx/audio/src/openmax_il/g722_enc/tests/Android.mk index 568798f..d9a38d9 100755 --- a/omx/audio/src/openmax_il/g722_enc/tests/Android.mk +++ b/omx/audio/src/openmax_il/g722_enc/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G722_ENC_TEST),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -20,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G722EncTest
include $(BUILD_EXECUTABLE)
+endif diff --git a/omx/audio/src/openmax_il/g726_dec/tests/Android.mk b/omx/audio/src/openmax_il/g726_dec/tests/Android.mk index 3b2b75e..b4acd27 100755 --- a/omx/audio/src/openmax_il/g726_dec/tests/Android.mk +++ b/omx/audio/src/openmax_il/g726_dec/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G726_DEC_TEST),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -20,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G726DecTest
include $(BUILD_EXECUTABLE)
+endif diff --git a/omx/audio/src/openmax_il/g726_enc/tests/Android.mk b/omx/audio/src/openmax_il/g726_enc/tests/Android.mk index b3f4187..3f2fed2 100755 --- a/omx/audio/src/openmax_il/g726_enc/tests/Android.mk +++ b/omx/audio/src/openmax_il/g726_enc/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G726_ENC_TEST),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -20,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G726EncTest
include $(BUILD_EXECUTABLE)
+endif diff --git a/omx/audio/src/openmax_il/g729_dec/tests/Android.mk b/omx/audio/src/openmax_il/g729_dec/tests/Android.mk index 4379f07..cf681eb 100755 --- a/omx/audio/src/openmax_il/g729_dec/tests/Android.mk +++ b/omx/audio/src/openmax_il/g729_dec/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G729_DEC_TEST),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -20,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G729DecTest
include $(BUILD_EXECUTABLE)
+endif diff --git a/omx/audio/src/openmax_il/g729_enc/tests/Android.mk b/omx/audio/src/openmax_il/g729_enc/tests/Android.mk index fcfaa60..9df93a0 100755 --- a/omx/audio/src/openmax_il/g729_enc/tests/Android.mk +++ b/omx/audio/src/openmax_il/g729_enc/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_G729_ENC_TEST),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -20,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= G729EncTest_common
include $(BUILD_EXECUTABLE)
+endif diff --git a/omx/audio/src/openmax_il/mp3_dec/src/Android.mk b/omx/audio/src/openmax_il/mp3_dec/src/Android.mk index 69aa493..ecf8953 100644 --- a/omx/audio/src/openmax_il/mp3_dec/src/Android.mk +++ b/omx/audio/src/openmax_il/mp3_dec/src/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_MP3_DECODER),1) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -25,4 +26,5 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMAP_2430 LOCAL_MODULE:= libOMX.TI.MP3.decode -include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file +include $(BUILD_SHARED_LIBRARY) +endif diff --git a/omx/audio/src/openmax_il/nbamr_dec/src/Android.mk b/omx/audio/src/openmax_il/nbamr_dec/src/Android.mk index a863540..648bfec 100644 --- a/omx/audio/src/openmax_il/nbamr_dec/src/Android.mk +++ b/omx/audio/src/openmax_il/nbamr_dec/src/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_AMRNB_DECODER),1)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -25,4 +26,5 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMAP_2430 LOCAL_MODULE:= libOMX.TI.AMR.decode
-include $(BUILD_SHARED_LIBRARY)
\ No newline at end of file +include $(BUILD_SHARED_LIBRARY)
+endif
diff --git a/omx/audio/src/openmax_il/nbamr_enc/tests/Android.mk b/omx/audio/src/openmax_il/nbamr_enc/tests/Android.mk index ef2c45a..4226ecc 100644 --- a/omx/audio/src/openmax_il/nbamr_enc/tests/Android.mk +++ b/omx/audio/src/openmax_il/nbamr_enc/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_NBAMR_ENC_TEST),1)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -19,3 +20,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= NBAMREncoder_Test
include $(BUILD_EXECUTABLE)
+endif
diff --git a/omx/audio/src/openmax_il/wbamr_dec/src/Android.mk b/omx/audio/src/openmax_il/wbamr_dec/src/Android.mk index e03c96d..06aafd7 100644 --- a/omx/audio/src/openmax_il/wbamr_dec/src/Android.mk +++ b/omx/audio/src/openmax_il/wbamr_dec/src/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_AMRWB_DECODER),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -26,3 +27,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMAP_2430 LOCAL_MODULE:= libOMX.TI.WBAMR.decode
include $(BUILD_SHARED_LIBRARY) +endif diff --git a/omx/audio/src/openmax_il/wbamr_dec/tests/Android.mk b/omx/audio/src/openmax_il/wbamr_dec/tests/Android.mk index 72af244..ac01978 100644 --- a/omx/audio/src/openmax_il/wbamr_dec/tests/Android.mk +++ b/omx/audio/src/openmax_il/wbamr_dec/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_WBAMR_DEC_TEST),1)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -19,3 +20,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= WBAmrDecTest_common
include $(BUILD_EXECUTABLE)
+endif
diff --git a/omx/audio/src/openmax_il/wbamr_enc/tests/Android.mk b/omx/audio/src/openmax_il/wbamr_enc/tests/Android.mk index b197e62..bea866d 100644 --- a/omx/audio/src/openmax_il/wbamr_enc/tests/Android.mk +++ b/omx/audio/src/openmax_il/wbamr_enc/tests/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_WBAMR_ENC_TEST),1)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -19,3 +20,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= WBAMREncoder_Test
include $(BUILD_EXECUTABLE)
+endif
diff --git a/omx/audio/src/openmax_il/wma_dec/src/Android.mk b/omx/audio/src/openmax_il/wma_dec/src/Android.mk index 3eec67e..dde59f8 100644 --- a/omx/audio/src/openmax_il/wma_dec/src/Android.mk +++ b/omx/audio/src/openmax_il/wma_dec/src/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_WMA_DECODER),1) LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -25,3 +26,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMAP_2430 LOCAL_MODULE:= libOMX.TI.WMA.decode
include $(BUILD_SHARED_LIBRARY) +endif diff --git a/omx/audio/src/openmax_il/wma_dec/tests/Android.mk b/omx/audio/src/openmax_il/wma_dec/tests/Android.mk index eb74561..9bd8f16 100644 --- a/omx/audio/src/openmax_il/wma_dec/tests/Android.mk +++ b/omx/audio/src/openmax_il/wma_dec/tests/Android.mk @@ -1,3 +1,5 @@ +ifeq ($(BUILD_WMA_DEC_TEST),1)
+
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -19,3 +21,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMX_DEBUG LOCAL_MODULE:= WmaDecTest_common
include $(BUILD_EXECUTABLE)
+endif
diff --git a/omx/image/src/openmax_il/jpeg_dec/Android.mk b/omx/image/src/openmax_il/jpeg_dec/Android.mk index 0ede35b..fa9347f 100644 --- a/omx/image/src/openmax_il/jpeg_dec/Android.mk +++ b/omx/image/src/openmax_il/jpeg_dec/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_JPEG_DECODER),1) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -20,10 +21,10 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DOMAP_2430 #-DOMX_DEBUG LOCAL_MODULE:= libOMX.TI.JPEG.decode include $(BUILD_SHARED_LIBRARY) - +endif ######################################################### - +ifeq ($(BUILD_JPEG_DEC_TEST),1) include $(CLEAR_VARS) LOCAL_SRC_FILES:= tests/JPEGTest.c @@ -38,5 +39,5 @@ LOCAL_CFLAGS := -Wall -fpic -pipe -O0 -DOMX_DEBUG=1 LOCAL_MODULE:= JpegTestCommon include $(BUILD_EXECUTABLE) - +endif diff --git a/omx/image/src/openmax_il/jpeg_enc/Android.mk b/omx/image/src/openmax_il/jpeg_enc/Android.mk index 631b250..99e282b 100644 --- a/omx/image/src/openmax_il/jpeg_enc/Android.mk +++ b/omx/image/src/openmax_il/jpeg_enc/Android.mk @@ -21,7 +21,7 @@ LOCAL_MODULE:= libOMX.TI.JPEG.Encoder include $(BUILD_SHARED_LIBRARY) ######################################################### - +ifeq ($(BUILD_JPEG_ENC_TEST),1) include $(CLEAR_VARS) LOCAL_SRC_FILES:= test/JPEGTestEnc.c @@ -36,5 +36,5 @@ LOCAL_CFLAGS := -Wall -fpic -pipe -O0 -DOMX_DEBUG=1 LOCAL_MODULE:= JPEGTestEnc_common include $(BUILD_EXECUTABLE) - +endif diff --git a/omx/video/src/openmax_il/prepost_processor/Android.mk b/omx/video/src/openmax_il/prepost_processor/Android.mk index 6bff301..d8293e9 100755 --- a/omx/video/src/openmax_il/prepost_processor/Android.mk +++ b/omx/video/src/openmax_il/prepost_processor/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_VPP),1) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -33,9 +34,10 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) -DANDROID -DOMAP_2430 -g LOCAL_MODULE:= libOMX.TI.VPP include $(BUILD_SHARED_LIBRARY) +endif ######################################################### - +ifeq ($(BUILD_VPP_TEST),1) include $(CLEAR_VARS) LOCAL_SRC_FILES:= @@ -50,5 +52,5 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) LOCAL_MODULE:= VPPTest_common include $(BUILD_EXECUTABLE) - +endif diff --git a/omx/video/src/openmax_il/video_encode/test/Android.mk b/omx/video/src/openmax_il/video_encode/test/Android.mk index 08c2eec..62badfe 100755 --- a/omx/video/src/openmax_il/video_encode/test/Android.mk +++ b/omx/video/src/openmax_il/video_encode/test/Android.mk @@ -1,3 +1,4 @@ +ifeq ($(BUILD_VIDEO_ENC_TEST),1)
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
@@ -19,3 +20,4 @@ LOCAL_CFLAGS := $(TI_OMX_CFLAGS) LOCAL_MODULE:= VideoEncTest
include $(BUILD_EXECUTABLE)
+endif
|