summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--domx/Android.mk4
-rw-r--r--libtiutils/Android.mk12
2 files changed, 13 insertions, 3 deletions
diff --git a/domx/Android.mk b/domx/Android.mk
index 6571161..f2f9b7f 100644
--- a/domx/Android.mk
+++ b/domx/Android.mk
@@ -1 +1,3 @@
-include $(all-subdir-makefiles)
+ifeq ($(TI_CUSTOM_DOMX_PATH),)
+ include $(all-subdir-makefiles)
+endif
diff --git a/libtiutils/Android.mk b/libtiutils/Android.mk
index e15eba9..40596b7 100644
--- a/libtiutils/Android.mk
+++ b/libtiutils/Android.mk
@@ -20,8 +20,16 @@ LOCAL_SHARED_LIBRARIES:= \
LOCAL_C_INCLUDES += \
bionic/libc/include \
- hardware/ti/omap4xxx/domx/omx_core/inc \
- hardware/ti/omap4xxx/domx/mm_osal/inc
+
+ifneq ($(TI_CUSTOM_DOMX_PATH),)
+LOCAL_C_INCLUDES += \
+ $(TI_CUSTOM_DOMX_PATH)/omx_core/inc \
+ $(TI_CUSTOM_DOMX_PATH)/mm_osal/inc
+else
+LOCAL_C_INCLUDES += \
+ hardware/ti/omap4xxx/domx/omx_core/inc \
+ hardware/ti/omap4xxx/domx/mm_osal/inc
+endif
LOCAL_CFLAGS += -fno-short-enums