Merge branch 'update_xmp' into 'master'

Don't update Xmp Mod Player to 4.4.1 (75)

Build (app and native libs) works however all tested versions (4.3.1, 4.4.0, 4.4.1) with the new build receipt is crashing on the android emulator and a "real" device with the following error in logcat:

``
--------- beginning of crash
E/AndroidRuntime( 1121): FATAL EXCEPTION: main
E/AndroidRuntime( 1121): Process: org.helllabs.android.xmp, PID: 1121
E/AndroidRuntime( 1121): java.lang.RuntimeException: Unable to start activity ComponentInfo{org.helllabs.android.xmp/org.helllabs.android.xmp.browser.PlaylistMenu}: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.app.ActionBar.setHomeButtonEnabled(boolean)' on a null object reference
E/AndroidRuntime( 1121): 	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2298)
E/AndroidRuntime( 1121): 	at android.app.ActivityThread.handleLaunchActivity(ActivityThread.java:2360)
E/AndroidRuntime( 1121): 	at android.app.ActivityThread.access$800(ActivityThread.java:144)
E/AndroidRuntime( 1121): 	at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1278)
E/AndroidRuntime( 1121): 	at android.os.Handler.dispatchMessage(Handler.java:102)
E/AndroidRuntime( 1121): 	at android.os.Looper.loop(Looper.java:135)
E/AndroidRuntime( 1121): 	at android.app.ActivityThread.main(ActivityThread.java:5221)
E/AndroidRuntime( 1121): 	at java.lang.reflect.Method.invoke(Native Method)
E/AndroidRuntime( 1121): 	at java.lang.reflect.Method.invoke(Method.java:372)
E/AndroidRuntime( 1121): 	at com.android.internal.os.ZygoteInit$MethodAndArgsCaller.run(ZygoteInit.java:899)
E/AndroidRuntime( 1121): 	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:694)
E/AndroidRuntime( 1121): Caused by: java.lang.NullPointerException: Attempt to invoke virtual method 'void android.app.ActionBar.setHomeButtonEnabled(boolean)' on a null object reference
E/AndroidRuntime( 1121): 	at org.helllabs.android.xmp.browser.PlaylistMenu.i(MyApplication:91)
E/AndroidRuntime( 1121): 	at org.helllabs.android.xmp.browser.PlaylistMenu.onCreate(MyApplication:83)
E/AndroidRuntime( 1121): 	at android.app.Activity.performCreate(Activity.java:5933)
E/AndroidRuntime( 1121): 	at android.app.Instrumentation.callActivityOnCreate(Instrumentation.java:1105)
E/AndroidRuntime( 1121): 	at android.app.ActivityThread.performLaunchActivity(ActivityThread.java:2251)
E/AndroidRuntime( 1121): 	... 10 more
``

See merge request !580
This commit is contained in:
Boris Kraut 2015-02-20 20:41:32 +00:00
commit c23e7e1686

View file

@ -150,9 +150,38 @@ Build:4.3.1,73
buildjni=yes
ndk=r10d
Build:4.4.1,75
disable=app crash on startup
commit=android-4.4.1
srclibs=Libxmp@libxmp-4.3.5,Support@android-5.0.1_r1,1:Volley@android-5.0.1_r1,Groundy@0f16c8e30e543d3a017a884530e179a0de65db50
rm=libs/*.jar,doc/xmp-android.asta
extlibs=android/android-support-v4.jar
prebuild=sed -i 's;../../../libxmp;../$$Libxmp$$;' jni/Android.mk && \
pushd $$Libxmp$$ && \
autoconf && \
./configure && \
popd && \
mkdir -p $$Support$$/v7/appcompat/libs && \
mkdir -p $$Support$$/v7/gridlayout/libs && \
cp libs/android-support-v4.jar $$Support$$/v7/appcompat/libs && \
mv libs/android-support-v4.jar $$Support$$/v7/gridlayout/libs && \
echo -e "java.source=7\njava.target=7" >> $$Support$$/v7/appcompat/local.properties && \
echo android.library.reference.2=$$Support$$/v7/appcompat >> project.properties && \
echo android.library.reference.3=$$Support$$/v7/gridlayout >> project.properties
target=android-21
build=pushd $$Libxmp$$ && \
$$NDK$$/ndk-build && \
popd && \
pushd $$Groundy$$ && \
gradle jar && \
popd && \
mv $$Groundy$$/build/libs/groundy-1.5.jar libs/ && \
$$NDK$$/ndk-build TARGET_PLATFORM=android-21
buildjni=no
ndk=r10d
Maintainer Notes:
The most recent libxmp version should be finde for all builds.
No native libs, even with the old method on r10d are build locally.
The most recent libxmp version should be fine for all builds.
.
Auto Update Mode:None