diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-10-18 08:33:38 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-10-18 08:33:38 -0700 |
| commit | 5582cc3a68589c905d56a05b17ba4d247c1b78b0 (patch) | |
| tree | 4f94c0362154a35456a5a2a3847fa31bcf83d652 /cmds/stagefright | |
| parent | 5b9fd116f9b63e06fa431a57a1c2e4e5bc03f3fc (diff) | |
| parent | fb47487259f0d5329d0fdbdecfc56baab9b96817 (diff) | |
| download | frameworks_base-5582cc3a68589c905d56a05b17ba4d247c1b78b0.zip frameworks_base-5582cc3a68589c905d56a05b17ba4d247c1b78b0.tar.gz frameworks_base-5582cc3a68589c905d56a05b17ba4d247c1b78b0.tar.bz2 | |
Merge fb474872 from gingerbread-plus-aosp
Change-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3
Diffstat (limited to 'cmds/stagefright')
| -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 cbdf119..5b31b98 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 @@ -86,7 +86,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 |