Merge branch 'ServeStream' into 'master'
Disable ServeStream 0.7.0 Uses a GMS library See merge request !212
This commit is contained in:
commit
a72cf730b4
|
@ -117,6 +117,22 @@ Build:0.6.8,98
|
|||
build=./scripts/build-ffmpeg.sh
|
||||
buildjni=yes
|
||||
|
||||
Build:0.7.0,105
|
||||
disable=Uses com.google.android.gms.cast.{MediaInfo,MediaStatus}
|
||||
commit=v0.7.0
|
||||
target=android-19
|
||||
srclibs=1:appcompat@ad5a63f,Jericho@3.3
|
||||
prebuild=cp $$appcompat$$/libs/android-support-v4.jar libs/ && \
|
||||
cp $$appcompat$$/libs/android-support-v7-appcompat.jar libs/ && \
|
||||
cp -r $$Jericho$$/src/java/net/htmlparser/ src/net/ && \
|
||||
cp $$Jericho$$/compile-time-dependencies/* libs/ && \
|
||||
sed -i 's/make -j4/make -j2/g' scripts/* && \
|
||||
rm custom_rules.xml && \
|
||||
echo ndk.dir=$$NDK$$ >> local.properties && \
|
||||
chmod +x scripts/build-ffmpeg.sh
|
||||
build=./scripts/build-ffmpeg.sh
|
||||
buildjni=yes
|
||||
|
||||
Auto Update Mode:None
|
||||
Update Check Mode:Tags
|
||||
Current Version:0.7.0
|
||||
|
|
Loading…
Reference in a new issue