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 | fb47487259f0d5329d0fdbdecfc56baab9b96817 (patch) | |
| tree | 2a6292a6e900af0da1f7cdea799bc44404a9ece2 /cmds | |
| parent | 746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4 (diff) | |
| parent | b04f356d86eec74217fca8e3b85d801c4fcaa678 (diff) | |
| download | frameworks_base-fb47487259f0d5329d0fdbdecfc56baab9b96817.zip frameworks_base-fb47487259f0d5329d0fdbdecfc56baab9b96817.tar.gz frameworks_base-fb47487259f0d5329d0fdbdecfc56baab9b96817.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 'cmds')
| -rw-r--r-- | cmds/stagefright/Android.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 9a97284..5b74007 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -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 @@ -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 |