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

Commit 8ac0cb9d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

Merge fb474872 from gingerbread-plus-aosp 

Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
parents 3e00cc07 06fa2bcc

cmds/stagefright/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ LOCAL_C_INCLUDES:= \ 
	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	frameworks/base/media/libstagefright/include \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include

	$(TOP)/frameworks/base/include/media/stagefright/openmax



LOCAL_CFLAGS += -Wno-multichar
@@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include

	$(TOP)/frameworks/base/include/media/stagefright/openmax



LOCAL_CFLAGS += -Wno-multichar
@@ -86,7 +86,7 @@ LOCAL_SHARED_LIBRARIES := \ 
LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

	frameworks/base/media/libstagefright \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include

	$(TOP)/frameworks/base/include/media/stagefright/openmax



LOCAL_CFLAGS += -Wno-multichar

media/libmedia/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ endif 
LOCAL_C_INCLUDES := \

    $(JNI_H_INCLUDE) \

    $(call include-path-for, graphics corecg) \

    $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \

    $(TOP)/frameworks/base/include/media/stagefright/openmax \

    external/icu4c/common \

    external/expat/lib

media/libmediaplayerservice/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ endif 
LOCAL_C_INCLUDES :=                                                 \

	$(JNI_H_INCLUDE)                                                \

	$(call include-path-for, graphics corecg)                       \

	$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \

	$(TOP)/frameworks/base/include/media/stagefright/openmax \

	$(TOP)/frameworks/base/media/libstagefright/include             \

	$(TOP)/frameworks/base/media/libstagefright/rtsp                \

        $(TOP)/external/tremolo/Tremolo

media/libstagefright/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -49,8 +49,7 @@ LOCAL_SRC_FILES:= \ 


LOCAL_C_INCLUDES:= \

	$(JNI_H_INCLUDE) \

        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \

        $(TOP)/external/opencore/android \

        $(TOP)/frameworks/base/include/media/stagefright/openmax \

        $(TOP)/external/tremolo \

        $(TOP)/frameworks/base/media/libstagefright/rtsp

media/libstagefright/codecs/avc/dec/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LOCAL_C_INCLUDES := \ 
 	$(LOCAL_PATH)/include \

 	$(LOCAL_PATH)/../common/include \

        $(TOP)/frameworks/base/media/libstagefright/include \

        $(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include

        $(TOP)/frameworks/base/include/media/stagefright/openmax



LOCAL_CFLAGS := -DOSCL_IMPORT_REF= -DOSCL_UNUSED_ARG= -DOSCL_EXPORT_REF=