зеркало из https://github.com/mozilla/gecko-dev.git
Bug 922664 - Build omx-plugin in C++11 mode, and also stop supporting the update scripts for the omx-plugin Android headers; r=doublec
This commit is contained in:
Ehsan Akhgari
Родитель
bf34a5f2f0
Коммит
e8b992816f
|
|
@ -27,9 +27,8 @@ NO_INSTALL = 1
|
|||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
# Stagefright header files define many multichar constants.
|
||||
CXXFLAGS += -std=gnu++98 -Wno-multichar
|
||||
CXXFLAGS += -Wno-multichar
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
|
|
|
|||
|
|
@ -26,11 +26,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../../../content/media/plugins \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -26,11 +26,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../../../content/media/plugins \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -26,11 +26,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../../../content/media/plugins \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -26,11 +26,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(srcdir)/../../../content/media/plugins \
|
||||
$(NULL)
|
||||
|
|
|
|||
|
|
@ -1,25 +0,0 @@
|
|||
diff --git a/media/omx-plugin/include/froyo/stagefright/DataSource.h b/media/omx-plugin/include/froyo/stagefright/DataSource.h
|
||||
index 657f721..6f7dc38 100644
|
||||
--- a/media/omx-plugin/include/froyo/stagefright/DataSource.h
|
||||
+++ b/media/omx-plugin/include/froyo/stagefright/DataSource.h
|
||||
@@ -26,19 +26,11 @@
|
||||
#include <utils/RefBase.h>
|
||||
#include <utils/threads.h>
|
||||
|
||||
-#if !defined(STAGEFRIGHT_EXPORT)
|
||||
-#define STAGEFRIGHT_EXPORT
|
||||
-#endif
|
||||
-
|
||||
-#if !defined(MOZ_STAGEFRIGHT_OFF_T)
|
||||
-#define MOZ_STAGEFRIGHT_OFF_T off64_t
|
||||
-#endif
|
||||
-
|
||||
namespace android {
|
||||
|
||||
class String8;
|
||||
|
||||
-class STAGEFRIGHT_EXPORT DataSource : public RefBase {
|
||||
+class DataSource : public RefBase {
|
||||
public:
|
||||
enum Flags {
|
||||
kWantsPrefetching = 1,
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
# Usage: ./update.sh <android_froyo_os_src_directory>
|
||||
#
|
||||
# Copies the needed include files from the directory containing the original
|
||||
# Android Froyo OS source that we need for building the libstagefright support.
|
||||
cp $1/system/core/include/pixelflinger/pixelflinger.h ./pixelflinger/pixelflinger.h
|
||||
cp $1/system/core/include/pixelflinger/format.h ./pixelflinger/format.h
|
||||
cp $1/frameworks/base/include/utils/threads.h ./utils/threads.h
|
||||
cp $1/frameworks/base/include/utils/List.h ./utils/List.h
|
||||
cp $1/frameworks/base/include/utils/Errors.h ./utils/Errors.h
|
||||
cp $1/frameworks/base/include/utils/Vector.h ./utils/Vector.h
|
||||
cp $1/frameworks/base/include/utils/VectorImpl.h ./utils/VectorImpl.h
|
||||
cp $1/frameworks/base/include/utils/KeyedVector.h ./utils/KeyedVector.h
|
||||
cp $1/frameworks/base/include/utils/RefBase.h ./utils/RefBase.h
|
||||
cp $1/frameworks/base/include/utils/TextOutput.h ./utils/TextOutput.h
|
||||
cp $1/frameworks/base/include/utils/SharedBuffer.h ./utils/SharedBuffer.h
|
||||
cp $1/frameworks/base/include/utils/Timers.h ./utils/Timers.h
|
||||
cp $1/frameworks/base/include/utils/String16.h ./utils/String16.h
|
||||
cp $1/frameworks/base/include/utils/SortedVector.h ./utils/SortedVector.h
|
||||
cp $1/frameworks/base/include/utils/Log.h ./utils/Log.h
|
||||
cp $1/frameworks/base/include/utils/TypeHelpers.h ./utils/TypeHelpers.h
|
||||
cp $1/frameworks/base/include/utils/Flattenable.h ./utils/Flattenable.h
|
||||
cp $1/frameworks/base/include/utils/String8.h ./utils/String8.h
|
||||
cp $1/system/core/include/cutils/uio.h ./cutils/uio.h
|
||||
cp $1/system/core/include/cutils/atomic.h ./cutils/atomic.h
|
||||
cp $1/system/core/include/cutils/log.h ./cutils/log.h
|
||||
cp $1/system/core/include/cutils/native_handle.h ./cutils/native_handle.h
|
||||
cp $1/system/core/include/cutils/logd.h ./cutils/logd.h
|
||||
cp $1/frameworks/base/include/binder/IBinder.h ./binder/IBinder.h
|
||||
cp $1/frameworks/base/include/binder/Binder.h ./binder/Binder.h
|
||||
cp $1/frameworks/base/include/binder/IInterface.h ./binder/IInterface.h
|
||||
cp $1/frameworks/base/include/media/stagefright/ColorConverter.h ./stagefright/ColorConverter.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaExtractor.h ./stagefright/MediaExtractor.h
|
||||
cp $1/frameworks/base/include/media/stagefright/OMXCodec.h ./stagefright/OMXCodec.h
|
||||
cp $1/frameworks/base/include/media/stagefright/OMXClient.h ./stagefright/OMXClient.h
|
||||
cp $1/frameworks/base/include/media/stagefright/DataSource.h ./stagefright/DataSource.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MetaData.h ./stagefright/MetaData.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaErrors.h ./media/stagefright/MediaErrors.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaSource.h ./media/stagefright/MediaSource.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaBuffer.h ./media/stagefright/MediaBuffer.h
|
||||
cp $1/device/samsung/crespo/sec_mm/sec_omx/sec_omx_include/khronos/OMX_IVCommon.h ./media/stagefright/openmax/OMX_IVCommon.h
|
||||
cp $1/device/samsung/crespo/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Video.h ./media/stagefright/openmax/OMX_Video.h
|
||||
cp $1/device/samsung/crespo/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Index.h ./media/stagefright/openmax/OMX_Index.h
|
||||
cp $1/device/samsung/crespo/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Core.h ./media/stagefright/openmax/OMX_Core.h
|
||||
cp $1/device/samsung/crespo/sec_mm/sec_omx/sec_omx_include/khronos/OMX_Types.h ./media/stagefright/openmax/OMX_Types.h
|
||||
cp $1/frameworks/base/include/media/IOMX.h ./media/IOMX.h
|
||||
cp $1/frameworks/base/include/ui/Rect.h ./ui/Rect.h
|
||||
cp $1/frameworks/base/include/ui/Point.h ./ui/Point.h
|
||||
cp $1/frameworks/base/include/ui/PixelFormat.h ./ui/PixelFormat.h
|
||||
cp $1/frameworks/base/include/ui/egl/android_natives.h ./ui/egl/android_natives.h
|
||||
cp $1/frameworks/base/include/ui/android_native_buffer.h ./ui/android_native_buffer.h
|
||||
cp $1/frameworks/base/include/ui/GraphicBuffer.h ./ui/GraphicBuffer.h
|
||||
cp $1/frameworks/base/media/libstagefright/include/OMX.h ./OMX.h
|
||||
cp $1/hardware/libhardware/include/hardware/hardware.h ./hardware/hardware.h
|
||||
cp $1/hardware/libhardware/include/hardware/gralloc.h ./hardware/gralloc.h
|
||||
patch -R -p5 <update.patch
|
||||
|
|
@ -27,7 +27,9 @@
|
|||
|
||||
extern "C" {
|
||||
|
||||
#if !defined(__cplusplus) || __cplusplus == 199711L // C or C++98
|
||||
typedef uint16_t char16_t;
|
||||
#endif
|
||||
|
||||
// Standard string functions on char16 strings.
|
||||
int strcmp16(const char16_t *, const char16_t *);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,9 @@
|
|||
|
||||
extern "C" {
|
||||
|
||||
#if !defined(__cplusplus) || __cplusplus == 199711L // C or C++98
|
||||
typedef uint32_t char32_t;
|
||||
#endif
|
||||
|
||||
size_t strlen32(const char32_t *);
|
||||
size_t strnlen32(const char32_t *, size_t);
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
diff --git a/media/omx-plugin/include/gb/stagefright/DataSource.h b/media/omx-plugin/include/gb/stagefright/DataSource.h
|
||||
index 752d193..a3da3ed 100644
|
||||
--- a/media/omx-plugin/include/gb/stagefright/DataSource.h
|
||||
+++ b/media/omx-plugin/include/gb/stagefright/DataSource.h
|
||||
@@ -26,20 +26,12 @@
|
||||
#include <utils/RefBase.h>
|
||||
#include <utils/threads.h>
|
||||
|
||||
-#if !defined(STAGEFRIGHT_EXPORT)
|
||||
-#define STAGEFRIGHT_EXPORT
|
||||
-#endif
|
||||
-
|
||||
-#if !defined(MOZ_STAGEFRIGHT_OFF_T)
|
||||
-#define MOZ_STAGEFRIGHT_OFF_T off64_t
|
||||
-#endif
|
||||
-
|
||||
namespace android {
|
||||
|
||||
struct AMessage;
|
||||
class String8;
|
||||
|
||||
-class STAGEFRIGHT_EXPORT DataSource : public RefBase {
|
||||
+class DataSource : public RefBase {
|
||||
public:
|
||||
enum Flags {
|
||||
kWantsPrefetching = 1,
|
||||
@@ -55,13 +47,13 @@ public:
|
||||
|
||||
virtual status_t initCheck() const = 0;
|
||||
|
||||
- virtual ssize_t readAt(MOZ_STAGEFRIGHT_OFF_T offset, void *data, size_t size) = 0;
|
||||
+ virtual ssize_t readAt(off_t offset, void *data, size_t size) = 0;
|
||||
|
||||
// Convenience methods:
|
||||
bool getUInt16(off_t offset, uint16_t *x);
|
||||
|
||||
// May return ERROR_UNSUPPORTED.
|
||||
- virtual status_t getSize(MOZ_STAGEFRIGHT_OFF_T *size);
|
||||
+ virtual status_t getSize(off_t *size);
|
||||
|
||||
virtual uint32_t flags() {
|
||||
return 0;
|
||||
|
|
@ -1,57 +0,0 @@
|
|||
# Usage: ./update.sh <android_gb_os_src_directory>
|
||||
#
|
||||
# Copies the needed include files from the directory containing the original
|
||||
# Android GB OS source that we need for building the libstagefright support.
|
||||
cp $1/system/core/include/pixelflinger/pixelflinger.h ./pixelflinger/pixelflinger.h
|
||||
cp $1/system/core/include/pixelflinger/format.h ./pixelflinger/format.h
|
||||
cp $1/frameworks/base/include/utils/threads.h ./utils/threads.h
|
||||
cp $1/frameworks/base/include/utils/List.h ./utils/List.h
|
||||
cp $1/frameworks/base/include/utils/Errors.h ./utils/Errors.h
|
||||
cp $1/frameworks/base/include/utils/Vector.h ./utils/Vector.h
|
||||
cp $1/frameworks/base/include/utils/VectorImpl.h ./utils/VectorImpl.h
|
||||
cp $1/frameworks/base/include/utils/KeyedVector.h ./utils/KeyedVector.h
|
||||
cp $1/frameworks/base/include/utils/RefBase.h ./utils/RefBase.h
|
||||
cp $1/frameworks/base/include/utils/TextOutput.h ./utils/TextOutput.h
|
||||
cp $1/frameworks/base/include/utils/SharedBuffer.h ./utils/SharedBuffer.h
|
||||
cp $1/frameworks/base/include/utils/Timers.h ./utils/Timers.h
|
||||
cp $1/frameworks/base/include/utils/String16.h ./utils/String16.h
|
||||
cp $1/frameworks/base/include/utils/SortedVector.h ./utils/SortedVector.h
|
||||
cp $1/frameworks/base/include/utils/Log.h ./utils/Log.h
|
||||
cp $1/frameworks/base/include/utils/TypeHelpers.h ./utils/TypeHelpers.h
|
||||
cp $1/frameworks/base/include/utils/Flattenable.h ./utils/Flattenable.h
|
||||
cp $1/frameworks/base/include/utils/String8.h ./utils/String8.h
|
||||
cp $1/system/core/include/cutils/uio.h ./cutils/uio.h
|
||||
cp $1/system/core/include/cutils/atomic.h ./cutils/atomic.h
|
||||
cp $1/system/core/include/cutils/log.h ./cutils/log.h
|
||||
cp $1/system/core/include/cutils/native_handle.h ./cutils/native_handle.h
|
||||
cp $1/system/core/include/cutils/logd.h ./cutils/logd.h
|
||||
cp $1/frameworks/base/include/binder/IBinder.h ./binder/IBinder.h
|
||||
cp $1/frameworks/base/include/binder/Binder.h ./binder/Binder.h
|
||||
cp $1/frameworks/base/include/binder/IInterface.h ./binder/IInterface.h
|
||||
cp $1/frameworks/base/include/media/stagefright/ColorConverter.h ./stagefright/ColorConverter.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaExtractor.h ./stagefright/MediaExtractor.h
|
||||
cp $1/frameworks/base/include/media/stagefright/OMXCodec.h ./stagefright/OMXCodec.h
|
||||
cp $1/frameworks/base/include/media/stagefright/OMXClient.h ./stagefright/OMXClient.h
|
||||
cp $1/frameworks/base/include/media/stagefright/DataSource.h ./stagefright/DataSource.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MetaData.h ./stagefright/MetaData.h
|
||||
cp $1/frameworks/base/native/include/android/rect.h ./android/rect.h
|
||||
cp $1/frameworks/base/native/include/android/native_window.h ./android/native_window.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaErrors.h ./media/stagefright/MediaErrors.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaSource.h ./media/stagefright/MediaSource.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaBuffer.h ./media/stagefright/MediaBuffer.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h ./media/stagefright/openmax/OMX_IVCommon.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Video.h ./media/stagefright/openmax/OMX_Video.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Index.h ./media/stagefright/openmax/OMX_Index.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Core.h ./media/stagefright/openmax/OMX_Core.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Types.h ./media/stagefright/openmax/OMX_Types.h
|
||||
cp $1/frameworks/base/include/media/IOMX.h ./media/IOMX.h
|
||||
cp $1/frameworks/base/include/ui/Rect.h ./ui/Rect.h
|
||||
cp $1/frameworks/base/include/ui/Point.h ./ui/Point.h
|
||||
cp $1/frameworks/base/include/ui/PixelFormat.h ./ui/PixelFormat.h
|
||||
cp $1/frameworks/base/include/ui/egl/android_natives.h ./ui/egl/android_natives.h
|
||||
cp $1/frameworks/base/include/ui/android_native_buffer.h ./ui/android_native_buffer.h
|
||||
cp $1/frameworks/base/include/ui/GraphicBuffer.h ./ui/GraphicBuffer.h
|
||||
cp $1/frameworks/base/media/libstagefright/include/OMX.h ./OMX.h
|
||||
cp $1/hardware/libhardware/include/hardware/hardware.h ./hardware/hardware.h
|
||||
cp $1/hardware/libhardware/include/hardware/gralloc.h ./hardware/gralloc.h
|
||||
patch -R -p5 <update.patch
|
||||
|
|
@ -27,7 +27,9 @@
|
|||
|
||||
extern "C" {
|
||||
|
||||
#if !defined(__cplusplus) || __cplusplus == 199711L // C or C++98
|
||||
typedef uint16_t char16_t;
|
||||
#endif
|
||||
|
||||
// Standard string functions on char16 strings.
|
||||
int strcmp16(const char16_t *, const char16_t *);
|
||||
|
|
|
|||
|
|
@ -31,7 +31,9 @@
|
|||
|
||||
extern "C" {
|
||||
|
||||
#if !defined(__cplusplus) || __cplusplus == 199711L // C or C++98
|
||||
typedef uint32_t char32_t;
|
||||
#endif
|
||||
|
||||
size_t strlen32(const char32_t *);
|
||||
size_t strnlen32(const char32_t *, size_t);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
The source from this directory was copied from the Android OS source
|
||||
using the update.sh script and modified with patches as applied by
|
||||
that script.
|
||||
The source from this directory was copied from the Android OS source.
|
||||
Patches have been applied on top of the original source.
|
||||
|
||||
The git branch used from AOSP was android-4.0.4_r2.1.
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/media/omx-plugin/include/ics/stagefright/DataSource.h b/media/omx-plugin/include/ics/stagefright/DataSource.h
|
||||
index 81ef632..713af92 100644
|
||||
--- a/media/omx-plugin/include/ics/stagefright/DataSource.h
|
||||
+++ b/media/omx-plugin/include/ics/stagefright/DataSource.h
|
||||
@@ -28,16 +28,12 @@
|
||||
#include <utils/threads.h>
|
||||
#include <drm/DrmManagerClient.h>
|
||||
|
||||
-#if !defined(STAGEFRIGHT_EXPORT)
|
||||
-#define STAGEFRIGHT_EXPORT
|
||||
-#endif
|
||||
-
|
||||
namespace android {
|
||||
|
||||
struct AMessage;
|
||||
class String8;
|
||||
|
||||
-class STAGEFRIGHT_EXPORT DataSource : public RefBase {
|
||||
+class DataSource : public RefBase {
|
||||
public:
|
||||
enum Flags {
|
||||
kWantsPrefetching = 1,
|
||||
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
# Usage: ./update.sh <android_ics_os_src_directory>
|
||||
#
|
||||
# Copies the needed include files from the directory containing the original
|
||||
# Android ICS OS source that we need for building the libstagefright support.
|
||||
cp $1/system/core/include/pixelflinger/pixelflinger.h ./pixelflinger/pixelflinger.h
|
||||
cp $1/system/core/include/pixelflinger/format.h ./pixelflinger/format.h
|
||||
cp $1/system/core/include/system/graphics.h ./system/graphics.h
|
||||
cp $1/system/core/include/system/window.h ./system/window.h
|
||||
cp $1/frameworks/base/include/drm/drm_framework_common.h ./drm/drm_framework_common.h
|
||||
cp $1/frameworks/base/include/drm/DrmManagerClient.h ./drm/DrmManagerClient.h
|
||||
cp $1/frameworks/base/include/utils/threads.h ./utils/threads.h
|
||||
cp $1/frameworks/base/include/utils/List.h ./utils/List.h
|
||||
cp $1/frameworks/base/include/utils/Errors.h ./utils/Errors.h
|
||||
cp $1/frameworks/base/include/utils/Vector.h ./utils/Vector.h
|
||||
cp $1/frameworks/base/include/utils/VectorImpl.h ./utils/VectorImpl.h
|
||||
cp $1/frameworks/base/include/utils/KeyedVector.h ./utils/KeyedVector.h
|
||||
cp $1/frameworks/base/include/utils/RefBase.h ./utils/RefBase.h
|
||||
cp $1/frameworks/base/include/utils/SharedBuffer.h ./utils/SharedBuffer.h
|
||||
cp $1/frameworks/base/include/utils/Timers.h ./utils/Timers.h
|
||||
cp $1/frameworks/base/include/utils/String16.h ./utils/String16.h
|
||||
cp $1/frameworks/base/include/utils/SortedVector.h ./utils/SortedVector.h
|
||||
cp $1/frameworks/base/include/utils/Log.h ./utils/Log.h
|
||||
cp $1/frameworks/base/include/utils/TypeHelpers.h ./utils/TypeHelpers.h
|
||||
cp $1/frameworks/base/include/utils/Flattenable.h ./utils/Flattenable.h
|
||||
cp $1/frameworks/base/include/utils/StrongPointer.h ./utils/StrongPointer.h
|
||||
cp $1/frameworks/base/include/utils/Unicode.h ./utils/Unicode.h
|
||||
cp $1/frameworks/base/include/utils/String8.h ./utils/String8.h
|
||||
cp $1/system/core/include/cutils/uio.h ./cutils/uio.h
|
||||
cp $1/system/core/include/cutils/atomic.h ./cutils/atomic.h
|
||||
cp $1/system/core/include/cutils/log.h ./cutils/log.h
|
||||
cp $1/system/core/include/cutils/native_handle.h ./cutils/native_handle.h
|
||||
cp $1/system/core/include/cutils/logd.h ./cutils/logd.h
|
||||
cp $1/frameworks/base/include/binder/IBinder.h ./binder/IBinder.h
|
||||
cp $1/frameworks/base/include/binder/Binder.h ./binder/Binder.h
|
||||
cp $1/frameworks/base/include/binder/IInterface.h ./binder/IInterface.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaExtractor.h ./stagefright/MediaExtractor.h
|
||||
cp $1/frameworks/base/include/media/stagefright/OMXCodec.h ./stagefright/OMXCodec.h
|
||||
cp $1/frameworks/base/include/media/stagefright/OMXClient.h ./stagefright/OMXClient.h
|
||||
cp $1/frameworks/base/include/media/stagefright/DataSource.h ./stagefright/DataSource.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MetaData.h ./stagefright/MetaData.h
|
||||
cp $1/frameworks/base/native/include/android/rect.h ./android/rect.h
|
||||
cp $1/frameworks/base/native/include/android/native_window.h ./android/native_window.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaErrors.h ./media/stagefright/MediaErrors.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaSource.h ./media/stagefright/MediaSource.h
|
||||
cp $1/frameworks/base/include/media/stagefright/MediaBuffer.h ./media/stagefright/MediaBuffer.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_IVCommon.h ./media/stagefright/openmax/OMX_IVCommon.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Video.h ./media/stagefright/openmax/OMX_Video.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Index.h ./media/stagefright/openmax/OMX_Index.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Core.h ./media/stagefright/openmax/OMX_Core.h
|
||||
cp $1/frameworks/base/include/media/stagefright/openmax/OMX_Types.h ./media/stagefright/openmax/OMX_Types.h
|
||||
cp $1/frameworks/base/include/media/IOMX.h ./media/IOMX.h
|
||||
cp $1/frameworks/base/include/ui/Rect.h ./ui/Rect.h
|
||||
cp $1/frameworks/base/include/ui/Point.h ./ui/Point.h
|
||||
cp $1/frameworks/base/include/ui/PixelFormat.h ./ui/PixelFormat.h
|
||||
cp $1/frameworks/base/include/ui/egl/android_natives.h ./ui/egl/android_natives.h
|
||||
cp $1/frameworks/base/include/ui/android_native_buffer.h ./ui/android_native_buffer.h
|
||||
cp $1/frameworks/base/include/ui/GraphicBuffer.h ./ui/GraphicBuffer.h
|
||||
cp $1/hardware/libhardware/include/hardware/hardware.h ./hardware/hardware.h
|
||||
cp $1/hardware/libhardware/include/hardware/gralloc.h ./hardware/gralloc.h
|
||||
cp $1/hardware/libhardware/include/hardware/fb.h ./hardware/fb.h
|
||||
patch -R -p5 <update.patch
|
||||
|
|
@ -22,8 +22,10 @@
|
|||
|
||||
extern "C" {
|
||||
|
||||
#if !defined(__cplusplus) || __cplusplus == 199711L // C or C++98
|
||||
typedef uint32_t char32_t;
|
||||
typedef uint16_t char16_t;
|
||||
#endif
|
||||
|
||||
// Standard string functions on char16_t strings.
|
||||
int strcmp16(const char16_t *, const char16_t *);
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/froyo \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/froyo/media/stagefright/openmax \
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/gb/media/stagefright/openmax \
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/ics \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/ics/media/stagefright/openmax \
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@ NO_INSTALL = 1
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
ifdef GNU_CXX
|
||||
# Turn off C++ 11 features due to conflicts with Android OS headers and char16_t definition
|
||||
CXXFLAGS += -std=gnu++98
|
||||
endif
|
||||
|
||||
INCLUDES += \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/ics \
|
||||
-I$(topsrcdir)/media/omx-plugin/include/ics/media/stagefright/openmax \
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче