diff options
| author | James Dong <jdong@google.com> | 2010-02-22 12:07:11 -0800 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2010-02-22 12:12:27 -0800 |
| commit | 7b285fdeeb0fa42733136ae0f0365aae89c29193 (patch) | |
| tree | 5967e685484edf1982735520c2bb3eafdc973692 | |
| parent | a7d8550490e7973b12ab6aed936182ce30f882a1 (diff) | |
| download | omap3-7b285fdeeb0fa42733136ae0f0365aae89c29193.tar.gz | |
Restore the makefile changes
| -rw-r--r-- | omx/audio/src/openmax_il/aac_enc/tests/Android.mk | 2 | ||||
| -rw-r--r-- | omx/core_plugin/omx_core_plugin/Android.mk | 3 | ||||
| -rw-r--r-- | omx/system/src/openmax_il/omx_core/src/Android.mk | 1 | ||||
| -rw-r--r-- | omx/ti_omx_config_parser/Android.mk | 2 | ||||
| -rwxr-xr-x | omx/video/src/openmax_il/video_encode/test/Android.mk | 2 |
5 files changed, 8 insertions, 2 deletions
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/core_plugin/omx_core_plugin/Android.mk b/omx/core_plugin/omx_core_plugin/Android.mk index ffdff71..18a823d 100644 --- a/omx/core_plugin/omx_core_plugin/Android.mk +++ b/omx/core_plugin/omx_core_plugin/Android.mk @@ -1,3 +1,4 @@ +ifneq ($(BUILD_WITHOUT_PV),true) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_PRELINK_MODULE := false @@ -40,4 +41,4 @@ LOCAL_SHARED_LIBRARIES := libOMX_Core -include $(PV_TOP)/Android_system_extras.mk include $(BUILD_SHARED_LIBRARY) - +endif diff --git a/omx/system/src/openmax_il/omx_core/src/Android.mk b/omx/system/src/openmax_il/omx_core/src/Android.mk index 46ada09..b374a5c 100644 --- a/omx/system/src/openmax_il/omx_core/src/Android.mk +++ b/omx/system/src/openmax_il/omx_core/src/Android.mk @@ -13,7 +13,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libdl \ - libVendor_ti_omx_config_parser \ liblog LOCAL_CFLAGS := $(TI_OMX_CFLAGS) diff --git a/omx/ti_omx_config_parser/Android.mk b/omx/ti_omx_config_parser/Android.mk index 5c8ace8..4665c0f 100644 --- a/omx/ti_omx_config_parser/Android.mk +++ b/omx/ti_omx_config_parser/Android.mk @@ -1,3 +1,4 @@ +ifneq ($(BUILD_WITHOUT_PV),true) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) $(call add-prebuilt-files, ETC) @@ -54,3 +55,4 @@ LOCAL_C_INCLUDES := \ LOCAL_SHARED_LIBRARIES += libopencore_common include $(BUILD_SHARED_LIBRARY) +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
|