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 /cmds | |
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 'cmds')
-rw-r--r-- | cmds/stagefright/Android.mk | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cmds/stagefright/Android.mk b/cmds/stagefright/Android.mk index 52a9293..8687fab 100644 --- a/cmds/stagefright/Android.mk +++ b/cmds/stagefright/Android.mk @@ -12,8 +12,8 @@ LOCAL_SHARED_LIBRARIES := \ libjpeg libgui LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ - frameworks/base/media/libstagefright/include \ + frameworks/av/media/libstagefright \ + frameworks/av/media/libstagefright/include \ $(TOP)/frameworks/native/include/media/openmax \ external/jpeg \ @@ -37,7 +37,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -60,7 +60,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -84,7 +84,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright liblog libutils libbinder libstagefright_foundation LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -107,7 +107,7 @@ LOCAL_SHARED_LIBRARIES := \ libstagefright_foundation libmedia libmedia_native LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -130,7 +130,7 @@ LOCAL_SHARED_LIBRARIES := \ libmedia libmedia_native libgui libcutils libui LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar @@ -154,7 +154,7 @@ LOCAL_SHARED_LIBRARIES := \ libmedia libmedia_native libgui libcutils libui LOCAL_C_INCLUDES:= \ - frameworks/base/media/libstagefright \ + frameworks/av/media/libstagefright \ $(TOP)/frameworks/native/include/media/openmax LOCAL_CFLAGS += -Wno-multichar |