[FFmpeg-cvslog] libstagefright: fix build

Dmitry Monakhov git at videolan.org
Tue Jan 10 21:06:17 CET 2012


ffmpeg | branch: master | Dmitry Monakhov <dmonakhov at openvz.org> | Sat Jan  7 15:05:51 2012 +0000| [d7b786e9a1e228f4da30fb8dbf1db065629ea677] | committer: Mohamed Naufal

libstagefright: fix build

- Use headers from gingerbread-release branch instead of the current default ice cream sandwich
- Fix path mistype

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d7b786e9a1e228f4da30fb8dbf1db065629ea677
---

 tools/build_libstagefright |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tools/build_libstagefright b/tools/build_libstagefright
index ada8d4e..78c2084 100755
--- a/tools/build_libstagefright
+++ b/tools/build_libstagefright
@@ -6,15 +6,17 @@ if [ "$NDK" = "" ]; then
 fi
 
 echo "Fetching Android system headers"
-git clone --depth=1 git://github.com/CyanogenMod/android_frameworks_base.git ../android-source/frameworks/base
-git clone --depth=1 git://github.com/CyanogenMod/android_system_core.git ../android-source/system/core
+git clone --depth=1 --branch gingerbread-release git://github.com/CyanogenMod/android_frameworks_base.git ../android-source/frameworks/base
+git clone --depth=1 --branch gingerbread-release git://github.com/CyanogenMod/android_system_core.git ../android-source/system/core
 
 echo "Fetching Android libraries for linking"
 # Libraries from any froyo/gingerbread device/emulator should work
 # fine, since the symbols used should be available on most of them.
-if [ ! -f "../update-cm-7.0.3-N1-signed.zip" ]; then
-    wget http://download.cyanogenmod.com/get/update-cm-7.0.3-N1-signed.zip -P../
-    unzip update-cm-7.0.3-N1-signed.zip system/lib/* -d../
+if [ ! -d "../android-libs" ]; then
+    if [ ! -f "../update-cm-7.0.3-N1-signed.zip" ]; then
+        wget http://download.cyanogenmod.com/get/update-cm-7.0.3-N1-signed.zip -P../
+    fi
+    unzip ../update-cm-7.0.3-N1-signed.zip system/lib/* -d../
     mv ../system/lib ../android-libs
     rmdir ../system
 fi



More information about the ffmpeg-cvslog mailing list