diff options
| author | Hashcode <hashcode0f@gmail.com> | 2013-01-20 21:24:57 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-26 19:55:27 -0800 |
| commit | af0d73ecd047d278a20a717971ceee23785a6b55 (patch) | |
| tree | 2a3bfe55b935efcecc97e0efd36e3559bfa0f169 /media | |
| parent | fee3fc5b6f1169aea26c6e1d086c494d2e4a5f93 (diff) | |
| download | frameworks_base-af0d73ecd047d278a20a717971ceee23785a6b55.zip frameworks_base-af0d73ecd047d278a20a717971ceee23785a6b55.tar.gz frameworks_base-af0d73ecd047d278a20a717971ceee23785a6b55.tar.bz2 | |
[2/3] mediaeditor: Allow custom DOMX source instead of Google DOMX default
Part 2 of 3 patches: To allow omap4 devices to use custom "domx" source
via a new BoardConfig.mk item:
TI_CUSTOM_DOMX_PATH := device/<manufacturer>/<device-name>/domx
This setting provides for 3 changes during the build:
1. In hardware/ti/omap4xxx this settings stops standard Google domx
source from being built and changes the domx reference for tiutils.
2. In frameworks/base it changes the default openmax references for
frameworks/base/media/jni/mediaeditor/Android.mk to the new location
3. In frameworks/av changes the openmax references in 5 places, and adds
new includes in ACodec.cpp, CameraSource.cpp and OMXCodec.cpp
This commit is based on cherry-pick from omapzoom (with a more descriptive
BoardConfig setting name):
http://www.omapzoom.org/?p=platform/frameworks/base.git;a=commit;h=f7f929ff477955333bf7e7413a81a66d683d1f3f
Change-Id: I76e558ce840ea45eec14194f2e9107fb83cebf8f
Signed-off-by: Hashcode <hashcode0f@gmail.com>
Diffstat (limited to 'media')
| -rwxr-xr-x | media/jni/mediaeditor/Android.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/jni/mediaeditor/Android.mk b/media/jni/mediaeditor/Android.mk index 040d2ab..461ab4e 100755 --- a/media/jni/mediaeditor/Android.mk +++ b/media/jni/mediaeditor/Android.mk @@ -43,8 +43,13 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ $(TOP)/frameworks/av/libvideoeditor/lvpp \ - $(TOP)/frameworks/av/libvideoeditor/osal/inc \ - $(TOP)/frameworks/native/include/media/openmax + $(TOP)/frameworks/av/libvideoeditor/osal/inc + +ifneq ($(TI_CUSTOM_DOMX_PATH),) +LOCAL_C_INCLUDES += $(TI_CUSTOM_DOMX_PATH)/omx_core/inc +else +LOCAL_C_INCLUDES += $(TOP)/frameworks/native/include/media/openmax +endif LOCAL_SHARED_LIBRARIES := \ libandroid_runtime \ |