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/codecs/amrnb | |
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/codecs/amrnb')
-rw-r--r-- | media/libstagefright/codecs/amrnb/dec/Android.mk | 6 | ||||
-rw-r--r-- | media/libstagefright/codecs/amrnb/enc/Android.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/media/libstagefright/codecs/amrnb/dec/Android.mk b/media/libstagefright/codecs/amrnb/dec/Android.mk index 23a22ef..b81306d 100644 --- a/media/libstagefright/codecs/amrnb/dec/Android.mk +++ b/media/libstagefright/codecs/amrnb/dec/Android.mk @@ -61,12 +61,12 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/base/media/libstagefright/codecs/amrwb/src \ + frameworks/native/include/media/openmax \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../common/include \ - $(LOCAL_PATH)/../common \ - frameworks/base/media/libstagefright/codecs/amrwb/src \ + $(LOCAL_PATH)/../common LOCAL_CFLAGS := -DOSCL_IMPORT_REF= diff --git a/media/libstagefright/codecs/amrnb/enc/Android.mk b/media/libstagefright/codecs/amrnb/enc/Android.mk index 94e8726..21937bf 100644 --- a/media/libstagefright/codecs/amrnb/enc/Android.mk +++ b/media/libstagefright/codecs/amrnb/enc/Android.mk @@ -84,7 +84,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ frameworks/base/media/libstagefright/include \ - frameworks/base/include/media/stagefright/openmax \ + frameworks/native/include/media/openmax \ $(LOCAL_PATH)/src \ $(LOCAL_PATH)/include \ $(LOCAL_PATH)/../common/include \ |