diff options
| author | James Dong <jdong@google.com> | 2012-03-28 10:29:14 -0700 |
|---|---|---|
| committer | Anatol Pomozov <anatol.pomozov@gmail.com> | 2012-03-28 12:07:41 -0700 |
| commit | 559bf2836f5da25b75bfb229fec0d20d540ee426 (patch) | |
| tree | d7dd708b17eeca96a3e5d8bcc25a51ff3d1b5d0d /media/libstagefright/omx | |
| parent | b0b2b4d890cf3bfb274797a759642b4e733343d7 (diff) | |
| download | frameworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.zip frameworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.tar.gz frameworks_av-559bf2836f5da25b75bfb229fec0d20d540ee426.tar.bz2 | |
AV Android make files changes
o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc
o remove some runtime dependencies to libandroid, libandroid_runtime, etc
Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
Diffstat (limited to 'media/libstagefright/omx')
| -rw-r--r-- | media/libstagefright/omx/Android.mk | 2 | ||||
| -rw-r--r-- | media/libstagefright/omx/tests/Android.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/omx/Android.mk b/media/libstagefright/omx/Android.mk index d20ecb6..d7fbbbe 100644 --- a/media/libstagefright/omx/Android.mk +++ b/media/libstagefright/omx/Android.mk @@ -10,7 +10,7 @@ LOCAL_SRC_FILES:= \ SoftOMXPlugin.cpp \ LOCAL_C_INCLUDES += \ - frameworks/base/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/hardware \ $(TOP)/frameworks/native/include/media/openmax diff --git a/media/libstagefright/omx/tests/Android.mk b/media/libstagefright/omx/tests/Android.mk index 6aa7470..04441ca 100644 --- a/media/libstagefright/omx/tests/Android.mk +++ b/media/libstagefright/omx/tests/Android.mk @@ -8,7 +8,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright libbinder libmedia libutils libstagefright_foundation LOCAL_C_INCLUDES := \ - frameworks/base/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax LOCAL_MODULE := omx_tests |