diff options
| author | Andreas Huber <andih@google.com> | 2010-10-15 14:58:54 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-10-15 14:58:54 -0700 |
| commit | b04f356d86eec74217fca8e3b85d801c4fcaa678 (patch) | |
| tree | 281ebe8aa89780dd10530b219ed22dea97e34a65 /cmds | |
| parent | ff7a7a455c15077e2b691efa370619f06058f697 (diff) | |
| parent | a4f391c9bf581af19d6dec4603c194126995b6bf (diff) | |
| download | frameworks_base-b04f356d86eec74217fca8e3b85d801c4fcaa678.zip frameworks_base-b04f356d86eec74217fca8e3b85d801c4fcaa678.tar.gz frameworks_base-b04f356d86eec74217fca8e3b85d801c4fcaa678.tar.bz2 | |
Merge "Include the framework copy of the OpenMAX headers instead of referencing external/opencore." into gingerbread
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 |