Merge remote-tracking branch 'hexene/stagefright'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jan 2012 19:59:36 +0000 (20:59 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 10 Jan 2012 19:59:44 +0000 (20:59 +0100)
* hexene/stagefright:
  libstagefright: fix build

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
tools/build_libstagefright

index ada8d4e23933ded74ce06bf39ece6e23b150aace,78c20841ee5b1cdc5138a34e06436690bc9b1018..78c20841ee5b1cdc5138a34e06436690bc9b1018
mode 100644,100755..100644
@@@ -6,15 -6,17 +6,17 @@@ if [ "$NDK" = "" ]; the
  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