diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-10-13 17:54:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-13 18:04:02 +0200 |
| commit | 072a62b50ab4e54ee55585dc06a8e313d713b39f (patch) | |
| tree | 5c0783e7bc4d63936a17d12989edd1e2daf341c3 /tools | |
| parent | 40963ea9e9f8fbc178673c963f1d9662f3f20cfb (diff) | |
| parent | e82cbb69a768205d0bea2fc5b97377dff35d5e72 (diff) | |
| download | ffmpeg-072a62b50ab4e54ee55585dc06a8e313d713b39f.tar.gz | |
Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
tools/build_libstagefright: fetch android system headers and libraries
libstagefright: reindent after previous commit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/build_libstagefright | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/tools/build_libstagefright b/tools/build_libstagefright index a228487fb5..ada8d4e239 100644 --- a/tools/build_libstagefright +++ b/tools/build_libstagefright @@ -5,12 +5,27 @@ if [ "$NDK" = "" ]; then export NDK=${HOME}/android-ndk 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 + +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../ + mv ../system/lib ../android-libs + rmdir ../system +fi + + SYSROOT=$NDK/platforms/android-9/arch-arm # Expand the prebuilt/* path into the correct one TOOLCHAIN=`echo $NDK/toolchains/arm-linux-androideabi-4.4.3/prebuilt/*-x86` export PATH=$TOOLCHAIN/bin:$PATH -ANDROID_SOURCE=$HOME/android -ANDROID_LIBS=$HOME/glib +ANDROID_SOURCE=../android-source +ANDROID_LIBS=../android-libs rm -rf ../build/stagefright mkdir -p ../build/stagefright |