commit 1b118ffebd7769e092df47d617df9e20d38b023c
author Glenn Kasten <gkasten@google.com> Mon Apr 02 07:17:41 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 02 07:17:41 2012 -0700
tree 6b8322ccfeb6dfa0d8ab6185cde7f9889eeac795
parent e7b0c260194d155513f5e07105841597f7bb9ab8
parent 7880f29c5ae58e0dd5ac67753049acc8888cb5f5

Merge "Fast tracks"

src/Android.mk

diff --git a/src/Android.mk b/src/Android.mk
index c0ced44..25b9193 100644
--- a/src/Android.mk
+++ b/src/Android.mk
@@ -160,8 +160,8 @@
 
 LOCAL_C_INCLUDES:=                                                  \
         $(call include-path-for, wilhelm)                           \
-        frameworks/base/media/libstagefright                        \
-        frameworks/base/media/libstagefright/include                \
+        frameworks/av/media/libstagefright                        \
+        frameworks/av/media/libstagefright/include                \
         frameworks/native/include/media/openmax                     \
         $(call include-path-for, audio-effects)
 
@@ -201,8 +201,8 @@
 LOCAL_SRC_FILES := sl_entry.c sl_iid.c assert.c
 LOCAL_C_INCLUDES:=                                                  \
         $(call include-path-for, wilhelm)                           \
-        frameworks/base/media/libstagefright                        \
-        frameworks/base/media/libstagefright/include                \
+        frameworks/av/media/libstagefright                        \
+        frameworks/av/media/libstagefright/include                \
         frameworks/native/include/media/openmax
 LOCAL_MODULE := libOpenSLES
 LOCAL_PRELINK_MODULE := false
@@ -216,8 +216,8 @@
 LOCAL_SRC_FILES := xa_entry.c xa_iid.c assert.c
 LOCAL_C_INCLUDES:=                                                  \
         $(call include-path-for, wilhelm)                           \
-        frameworks/base/media/libstagefright                        \
-        frameworks/base/media/libstagefright/include                \
+        frameworks/av/media/libstagefright                        \
+        frameworks/av/media/libstagefright/include                \
         frameworks/native/include/media/openmax
 LOCAL_MODULE := libOpenMAXAL
 LOCAL_PRELINK_MODULE := false