commit 559bf2836f5da25b75bfb229fec0d20d540ee426
author James Dong <jdong@google.com> Wed Mar 28 10:29:14 2012 -0700
committer Anatol Pomozov <anatol.pomozov@gmail.com> Wed Mar 28 12:07:41 2012 -0700
tree d7dd708b17eeca96a3e5d8bcc25a51ff3d1b5d0d
parent b0b2b4d890cf3bfb274797a759642b4e733343d7

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

libvideoeditor/vss/src/Android.mk

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 @@
     $(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 \

libvideoeditor/vss/stagefrightshells/src/Android.mk

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 @@
     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_SHARED_LIBRARIES := \
     libcutils \
     libutils \
-    libandroid_runtime \
-    libnativehelper \
     libmedia \
     libbinder \
     libstagefright \