Debian: do not update old system image, added convenient launch script
This commit is contained in:
@@ -89,6 +89,7 @@ cp -f $CURDIR/debian-image/proot-prebuilt/$1/* ./
|
||||
cp -f $CURDIR/debian-image/dist/proot.sh ./
|
||||
cp -f $CURDIR/debian-image/dist/postinstall-img.sh ./
|
||||
cp -f $CURDIR/AndroidData/postinstall.sh ./
|
||||
cp -f $CURDIR/AndroidData/start-debian.sh ./
|
||||
|
||||
rm -f ../AndroidData/binaries-$1.zip
|
||||
rm -rf ../AndroidData/lib/$1
|
||||
|
||||
@@ -84,7 +84,8 @@ static int unpackFiles(const char *archive, const char *script, const char *dele
|
||||
if( strlen(deleteOldDataMarkerFile) > 0 && stat( fname2, &st ) == 0 )
|
||||
{
|
||||
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Upgrade detected, showing warning dialog");
|
||||
upgradeWarning = UPGRADE_WARNING_PROCEED;
|
||||
//upgradeWarning = UPGRADE_WARNING_PROCEED;
|
||||
upgradeWarning = UPGRADE_WARNING_CANCEL;
|
||||
/*
|
||||
upgradeWarning = UPGRADE_WARNING_ASK;
|
||||
while( upgradeWarning == UPGRADE_WARNING_ASK )
|
||||
|
||||
@@ -161,11 +161,12 @@
|
||||
+}
|
||||
--- Settings.java
|
||||
+++ Settings.java
|
||||
@@ -636,6 +636,7 @@ public class Settings
|
||||
@@ -637,6 +638,8 @@
|
||||
|
||||
static void setEnvVars(MainActivity p)
|
||||
{
|
||||
+ nativeSetEnv( "AUDIO_NATIVE_SAMPLE_RATE", String.valueOf(android.media.AudioTrack.getNativeOutputSampleRate(android.media.AudioManager.STREAM_MUSIC)) );
|
||||
+ nativeSetEnv( "OS_VERSION", System.getProperty("os.version", "4.0.0") );
|
||||
String lang = new String(Locale.getDefault().getLanguage());
|
||||
if( Locale.getDefault().getCountry().length() > 0 )
|
||||
lang = lang + "_" + Locale.getDefault().getCountry();
|
||||
|
||||
Reference in New Issue
Block a user