diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 20:59:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-10 20:59:44 +0100 |
| commit | 31801ded9a863252a7e64d0edc4e0c6c3adb72ad (patch) | |
| tree | 922e79654420635cc5bd780deb752eec02957fce | |
| parent | 5ab6f0fe5abf8c5fccede33f7b68c9f3a3864e3a (diff) | |
| parent | d7b786e9a1e228f4da30fb8dbf1db065629ea677 (diff) | |
| download | ffmpeg-31801ded9a863252a7e64d0edc4e0c6c3adb72ad.tar.gz | |
Merge remote-tracking branch 'hexene/stagefright'
* hexene/stagefright:
libstagefright: fix build
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tools/build_libstagefright | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tools/build_libstagefright b/tools/build_libstagefright index ada8d4e239..78c20841ee 100644 --- 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 |