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

cmds/stagefright/Android.mk

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 @@
         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 @@
 	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 @@
 	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 @@
 	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 @@
         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 @@
         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 @@
         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