summaryrefslogtreecommitdiffstats
path: root/domx/Android.mk
diff options
context:
space:
mode:
authorVidhoon Viswanathan <vidhoon@ti.com>2012-09-25 08:32:32 -0700
committerSejal Barot <sejal@ti.com>2012-10-04 17:26:46 +0530
commit94e8e7e3dce0c010d8eb8654b48efeb549225ba2 (patch)
tree7d444bb459f722b50d8aeb829890433d19182bf3 /domx/Android.mk
parent0da015ad970071c1ce09154b45574b5df72336d3 (diff)
downloadhardware_ti_omap4-94e8e7e3dce0c010d8eb8654b48efeb549225ba2.tar.gz
hardware_ti_omap4-94e8e7e3dce0c010d8eb8654b48efeb549225ba2.tar.bz2
hardware_ti_omap4-94e8e7e3dce0c010d8eb8654b48efeb549225ba2.zip
[PROXY] Integrate MemPlugin API within DOMX PROXY (PART1)
This patch integrates the generic memory manager APIs from MemPlugin introduced by http://review.omapzoom.org/#/c/27669/ into the DOMX proxy COMMON and components. This involves the following changes: *New element pMemPluginHandle has been introduced in PROXY_COMPONENT_PRIVATE to contain memory manager info and to link to corresponding APIs. *Remove ION APIs that are directly used in DOMX PROXY code. PROXY common is completely cleaned out in this patch. In component proxies, camera proxy is not completely clean yet since it requires more effort and testing. That will be done in PART 2. *Make changes to compile MemPlugin files that have been integrated and used within PROXY code. Tested on DB 285 with android and OMTB sanity. Change-Id: I31e9ecefcf5be77da237a7b1b6234b7f34cf99f7 Signed-off-by: Vidhoon Viswanathan <vidhoon@ti.com>
Diffstat (limited to 'domx/Android.mk')
-rw-r--r--domx/Android.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/domx/Android.mk b/domx/Android.mk
index 8a645af..143d7eb 100644
--- a/domx/Android.mk
+++ b/domx/Android.mk
@@ -9,7 +9,10 @@ LOCAL_SRC_FILES:= \
omx_rpc/src/omx_rpc_config.c \
omx_rpc/src/omx_rpc_platform.c \
omx_proxy_common/src/omx_proxy_common.c \
- profiling/src/profile.c
+ profiling/src/profile.c \
+ plugins/memplugin.c \
+ plugins/memplugin_table.c \
+ plugins/memplugin_ion.c
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/omx_rpc/inc \
@@ -19,7 +22,8 @@ LOCAL_C_INCLUDES += \
$(HARDWARE_TI_OMAP4_BASE)/hwc/ \
$(HARDWARE_TI_OMAP4_BASE)/include/ \
system/core/include/cutils \
- $(HARDWARE_TI_OMAP4_BASE)/../../libhardware/include
+ $(HARDWARE_TI_OMAP4_BASE)/../../libhardware/include \
+ $(LOCAL_PATH)/plugins/inc/
LOCAL_CFLAGS += -D_Android -DENABLE_GRALLOC_BUFFERS -DUSE_ENHANCED_PORTRECONFIG -DANDROID_QUIRK_LOCK_BUFFER -DUSE_ION