diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 18:25:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:25:14 -0700 |
| commit | 06fa2bcce5dd80b406a23f980d8c9fac1524ebfd (patch) | |
| tree | 340fd639cd8c487e65c47e4d44ee66974d8a9b85 /media/libstagefright/rtsp | |
| parent | 30550ba7a19372daa7424710ca1367bb7299e459 (diff) | |
| parent | 56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627 (diff) | |
| download | frameworks_av-06fa2bcce5dd80b406a23f980d8c9fac1524ebfd.zip frameworks_av-06fa2bcce5dd80b406a23f980d8c9fac1524ebfd.tar.gz frameworks_av-06fa2bcce5dd80b406a23f980d8c9fac1524ebfd.tar.bz2 | |
am b04f356d: Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
Merge commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678' into gingerbread-plus-aosp
* commit 'b04f356d86eec74217fca8e3b85d801c4fcaa678':
Include the framework copy of the OpenMAX headers instead of referencing external/opencore.
Diffstat (limited to 'media/libstagefright/rtsp')
| -rw-r--r-- | media/libstagefright/rtsp/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/rtsp/Android.mk b/media/libstagefright/rtsp/Android.mk index ed16059..081ae32 100644 --- a/media/libstagefright/rtsp/Android.mk +++ b/media/libstagefright/rtsp/Android.mk @@ -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 @@ -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 |