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 /libvideoeditor | |
| 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 'libvideoeditor')
| -rwxr-xr-x | libvideoeditor/lvpp/Android.mk | 10 | ||||
| -rwxr-xr-x | libvideoeditor/lvpp/PreviewRenderer.h | 1 | ||||
| -rwxr-xr-x | libvideoeditor/vss/src/Android.mk | 2 | ||||
| -rwxr-xr-x | libvideoeditor/vss/stagefrightshells/src/Android.mk | 10 |
4 files changed, 10 insertions, 13 deletions
diff --git a/libvideoeditor/lvpp/Android.mk b/libvideoeditor/lvpp/Android.mk index 4c354ec..f805ff7 100755 --- a/libvideoeditor/lvpp/Android.mk +++ b/libvideoeditor/lvpp/Android.mk @@ -66,10 +66,10 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_C_INCLUDES += \ $(TOP)/system/media/audio_utils/include \ - $(TOP)/frameworks/base/media/libmediaplayerservice \ - $(TOP)/frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/media/libstagefright/rtsp \ + $(TOP)/frameworks/av/media/libmediaplayerservice \ + $(TOP)/frameworks/av/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright/include \ + $(TOP)/frameworks/av/media/libstagefright/rtsp \ $(call include-path-for, corecg graphics) \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ @@ -77,7 +77,7 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/vss/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ $(TOP)/frameworks/av/libvideoeditor/lvpp \ - $(TOP)/frameworks/base/services/audioflinger \ + $(TOP)/frameworks/av/services/audioflinger \ $(TOP)/frameworks/native/include/media/editor \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/frameworks/native/services/audioflinger diff --git a/libvideoeditor/lvpp/PreviewRenderer.h b/libvideoeditor/lvpp/PreviewRenderer.h index 91c2295..ce28276 100755 --- a/libvideoeditor/lvpp/PreviewRenderer.h +++ b/libvideoeditor/lvpp/PreviewRenderer.h @@ -22,7 +22,6 @@ #include <utils/RefBase.h> #include <system/window.h> #include <ui/GraphicBufferMapper.h> -#include "SoftwareRenderer.h" namespace android { diff --git a/libvideoeditor/vss/src/Android.mk b/libvideoeditor/vss/src/Android.mk index df6925e..7d9cd9d 100755 --- a/libvideoeditor/vss/src/Android.mk +++ b/libvideoeditor/vss/src/Android.mk @@ -67,7 +67,7 @@ LOCAL_C_INCLUDES += \ $(TOP)/frameworks/av/libvideoeditor/vss/mcs/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/common/inc \ $(TOP)/frameworks/av/libvideoeditor/vss/stagefrightshells/inc \ - $(TOP)/frameworks/base/services/audioflinger \ + $(TOP)/frameworks/av/services/audioflinger \ $(TOP)/frameworks/native/include/media/openmax \ $(TOP)/frameworks/native/services/audioflinger \ $(TOP)/system/media/audio_effects/include \ diff --git a/libvideoeditor/vss/stagefrightshells/src/Android.mk b/libvideoeditor/vss/stagefrightshells/src/Android.mk index acc6b0e..378a795 100755 --- a/libvideoeditor/vss/stagefrightshells/src/Android.mk +++ b/libvideoeditor/vss/stagefrightshells/src/Android.mk @@ -29,10 +29,10 @@ LOCAL_SRC_FILES:= \ VideoEditorAudioEncoder.cpp LOCAL_C_INCLUDES += \ - $(TOP)/frameworks/base/media/libmediaplayerservice \ - $(TOP)/frameworks/base/media/libstagefright \ - $(TOP)/frameworks/base/media/libstagefright/include \ - $(TOP)/frameworks/base/media/libstagefright/rtsp \ + $(TOP)/frameworks/av/media/libmediaplayerservice \ + $(TOP)/frameworks/av/media/libstagefright \ + $(TOP)/frameworks/av/media/libstagefright/include \ + $(TOP)/frameworks/av/media/libstagefright/rtsp \ $(call include-path-for, corecg graphics) \ $(TOP)/frameworks/av/libvideoeditor/lvpp \ $(TOP)/frameworks/av/libvideoeditor/osal/inc \ @@ -46,8 +46,6 @@ LOCAL_C_INCLUDES += \ LOCAL_SHARED_LIBRARIES := \ libcutils \ libutils \ - libandroid_runtime \ - libnativehelper \ libmedia \ libbinder \ libstagefright \ |