Skip to content

Commit

Permalink
Include the framework copy of the OpenMAX headers instead of referenc…
Browse files Browse the repository at this point in the history 
…ing external/opencore.

Change-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6
related-to-bug: 3101573
  • Loading branch information
@theandi666
theandi666 committed Oct 15, 2010
1 parent 6ac35f0 commit a4f391c
Show file tree
Hide file tree
Showing 17 changed files with 23 additions and 20 deletions.
6 changes: 3 additions & 3 deletions cmds/stagefright/Android.mk
View file
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -61,7 +61,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

Expand Down
2 changes: 1 addition & 1 deletion media/libmedia/Android.mk
View file
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion media/libmediaplayerservice/Android.mk
View file
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions media/libstagefright/Android.mk
View file
Expand Up @@ -46,8 +46,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

Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/codecs/avc/dec/Android.mk
View file
Expand Up @@ -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=

Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/codecs/avc/enc/Android.mk
View file
Expand Up @@ -25,7 +25,7 @@ LOCAL_MODULE := libstagefright_avcenc
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/src \
$(LOCAL_PATH)/../common/include \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/frameworks/base/media/libstagefright/include

LOCAL_CFLAGS := \
Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/codecs/m4v_h263/dec/Android.mk
View file
Expand Up @@ -43,7 +43,7 @@ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/src \
$(LOCAL_PATH)/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_EXPORT_REF= -DOSCL_IMPORT_REF=

Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/codecs/m4v_h263/enc/Android.mk
View file
Expand Up @@ -31,7 +31,7 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/src \
$(LOCAL_PATH)/include \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/frameworks/base/media/libstagefright/include

include $(BUILD_STATIC_LIBRARY)
2 changes: 1 addition & 1 deletion media/libstagefright/codecs/on2/dec/Android.mk
View file
Expand Up @@ -8,7 +8,7 @@ LOCAL_MODULE := libstagefright_vpxdec

LOCAL_C_INCLUDES := \
$(TOP)/frameworks/base/media/libstagefright/include \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/external/libvpx \
$(TOP)/external/libvpx/vpx_codec \
$(TOP)/external/libvpx/vpx_ports
Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/colorconversion/Android.mk
View file
Expand Up @@ -6,7 +6,7 @@ LOCAL_SRC_FILES:= \
SoftwareRenderer.cpp

LOCAL_C_INCLUDES := \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include
$(TOP)/frameworks/base/include/media/stagefright/openmax

LOCAL_SHARED_LIBRARIES := \
libbinder \
Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/httplive/Android.mk
View file
Expand Up @@ -8,7 +8,7 @@ LOCAL_SRC_FILES:= \

LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/frameworks/base/media/libstagefright

LOCAL_MODULE:= libstagefright_httplive
Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/matroska/Android.mk
View file
Expand Up @@ -7,7 +7,7 @@ LOCAL_SRC_FILES:= \

LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \

LOCAL_CFLAGS += -Wno-multichar

Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/mpeg2ts/Android.mk
View file
Expand Up @@ -10,7 +10,7 @@ LOCAL_SRC_FILES:= \

LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/frameworks/base/media/libstagefright

LOCAL_MODULE:= libstagefright_mpeg2ts
Expand Down
4 changes: 4 additions & 0 deletions media/libstagefright/omx/Android.mk
View file
@@ -1,10 +1,12 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)

ifneq ($(BUILD_WITHOUT_PV),true)
# Set up the OpenCore variables.
include external/opencore/Config.mk
LOCAL_C_INCLUDES := $(PV_INCLUDES)
LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY)
endif

LOCAL_C_INCLUDES += $(JNI_H_INCLUDE)

Expand All @@ -21,6 +23,8 @@ else
LOCAL_CFLAGS += -DNO_OPENCORE
endif

LOCAL_C_INCLUDES += $(TOP)/frameworks/base/include/media/stagefright/openmax

LOCAL_SHARED_LIBRARIES := \
libbinder \
libmedia \
Expand Down
2 changes: 1 addition & 1 deletion media/libstagefright/omx/tests/Android.mk
View file
Expand Up @@ -10,7 +10,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_MODULE:= omx_tests

Expand Down
4 changes: 2 additions & 2 deletions media/libstagefright/rtsp/Android.mk
View file
Expand Up @@ -21,7 +21,7 @@ LOCAL_SRC_FILES:= \

LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/frameworks/base/media/libstagefright/include \

LOCAL_MODULE:= libstagefright_rtsp
Expand All @@ -48,7 +48,7 @@ LOCAL_STATIC_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

Expand Down
2 changes: 1 addition & 1 deletion media/tests/omxjpegdecoder/Android.mk
View file
Expand Up @@ -44,7 +44,7 @@ LOCAL_C_INCLUDES := \
$(TOP)/external/skia/include/utils \
$(TOP)/external/skia/include/effects \
$(TOP)/frameworks/base/media/libstagefright \
$(TOP)/external/opencore/extern_libs_v2/khronos/openmax/include \
$(TOP)/frameworks/base/include/media/stagefright/openmax \
$(TOP)/frameworks/base/include/ \
$(TOP)/frameworks/base/

Expand Down

0 comments on commit a4f391c

Please sign in to comment.