Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8a68f22 authored by Hashcode's avatar Hashcode Committed by Gerrit Code Review
Browse files

[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: I7ba8052a6144597bf961b78723186c58b7e12e48
parent 989201fa

media/jni/Android.mk

+9 −2
Original line number Diff line number Diff line
@@ -60,8 +60,15 @@ LOCAL_C_INCLUDES += \ 
    frameworks/av/media/libstagefright/codecs/amrnb/enc/src \

    frameworks/av/media/libstagefright/codecs/amrnb/common \

    frameworks/av/media/libstagefright/codecs/amrnb/common/include \

    frameworks/av/media/mtp \

    frameworks/native/include/media/openmax \

    frameworks/av/media/mtp



ifneq ($(TI_CUSTOM_DOMX_PATH),)

LOCAL_C_INCLUDES += $(TI_CUSTOM_DOMX_PATH)/omx_core/inc

else

LOCAL_C_INCLUDES += frameworks/native/include/media/openmax

endif



LOCAL_C_INCLUDES += \

    $(call include-path-for, libhardware)/hardware \

    system/media/camera/include \

    $(PV_INCLUDES) \