diff options
| author | James Dong <jdong@google.com> | 2012-03-12 14:37:53 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2012-03-12 21:28:57 -0700 |
| commit | 6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb (patch) | |
| tree | 307356be51d237ee22f88affdc3376270d571be9 /media/libstagefright/omx | |
| parent | aa4397f07c43bd83bc3100b749401dc3d15e7622 (diff) | |
| download | frameworks_av-6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb.zip frameworks_av-6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb.tar.gz frameworks_av-6c6b4d0d2b98a7ceee8b697daaf611f8df3254fb.tar.bz2 | |
Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base
o related-to-bug: 6044887
Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/Android.mk | 3 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXMaster.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/SoftOMXPlugin.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/tests/Android.mk | 2 |
5 files changed, 6 insertions, 5 deletions
diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index d844f3d..f587a9c 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -14,7 +14,8 @@ LOCAL_SRC_FILES:= \ LOCAL_C_INCLUDES += \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/hardware \ + $(TOP)/frameworks/native/include/media/openmax LOCAL_SHARED_LIBRARIES := \ libbinder \ diff --git a/media/libstagefright/omx/OMXMaster.h b/media/libstagefright/omx/OMXMaster.h index feee1f9..6069741 100644 --- a/media/libstagefright/omx/OMXMaster.h +++ b/media/libstagefright/omx/OMXMaster.h @@ -18,7 +18,7 @@ #define OMX_MASTER_H_ -#include <media/stagefright/OMXPluginBase.h> +#include <OMXPluginBase.h> #include <utils/threads.h> #include <utils/KeyedVector.h> diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index 099c4f5..bff3def 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -24,8 +24,8 @@ #include <OMX_Component.h> #include <binder/IMemory.h> +#include <HardwareAPI.h> #include <media/stagefright/foundation/ADebug.h> -#include <media/stagefright/HardwareAPI.h> #include <media/stagefright/MediaErrors.h> namespace android { diff --git a/media/libstagefright/omx/SoftOMXPlugin.h b/media/libstagefright/omx/SoftOMXPlugin.h index f93c323..c89cd87 100644 --- a/media/libstagefright/omx/SoftOMXPlugin.h +++ b/media/libstagefright/omx/SoftOMXPlugin.h @@ -19,7 +19,7 @@ #define SOFT_OMX_PLUGIN_H_ #include <media/stagefright/foundation/ABase.h> -#include <media/stagefright/OMXPluginBase.h> +#include <OMXPluginBase.h> namespace android { diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index 0c0a70c..07d47a8 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -10,7 +10,7 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES := \ $(JNI_H_INCLUDE) \ frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/include/media/stagefright/openmax + $(TOP)/frameworks/native/include/media/openmax LOCAL_MODULE := omx_tests |