diff --git a/AndroidManifest.xml.in b/AndroidManifest.xml.in index 6ea5c3f436f9ff6e0fc5310d96ac0ae8da56641c..e885b7ec39d526aa2d285884377884d34de73085 100644 --- a/AndroidManifest.xml.in +++ b/AndroidManifest.xml.in @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.i2p.android.router" - android.versionCode="0" - android.versionName="0.0.0-0_b0-API8" + android:versionCode="0" + android:versionName="0.0.0-0_b0-API8" android:installLocation="auto" > <uses-permission android:name="android.permission.INTERNET" /> diff --git a/custom_rules.xml b/custom_rules.xml index 66833a76278c73943a26e431e033e69f77c6ff62..64335524a1127725bb4f717619d4485f9134ad9a 100644 --- a/custom_rules.xml +++ b/custom_rules.xml @@ -238,10 +238,10 @@ props.store(fo, "AUTO-GENERATED FILE, DO NOT EDIT!"); fo.close(); } - sp1 = 'android.versionCode="[0-9]*"'; - rp1 = 'android.versionCode="' + props.getProperty("my.version.code") + '"'; - sp2 = 'android.versionName="[^"]*"'; - rp2 = 'android.versionName="' + props.getProperty("my.version.name") + '"'; + sp1 = 'android:versionCode="[0-9]*"'; + rp1 = 'android:versionCode="' + props.getProperty("my.version.code") + '"'; + sp2 = 'android:versionName="[^"]*"'; + rp2 = 'android:versionName="' + props.getProperty("my.version.name") + '"'; /* sed primary manifest */ cfg = File(attributes.get("mainxml") + ".in"); diff --git a/routerjars/AndroidManifest.xml.in b/routerjars/AndroidManifest.xml.in index 4f76fdedfe033e5308bd60a625ef9817225cd5d9..cd7a189d17102d0c93073512569aea0e177c52a0 100644 --- a/routerjars/AndroidManifest.xml.in +++ b/routerjars/AndroidManifest.xml.in @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="net.i2p.android.router" - android.versionCode="0" - android.versionName="0.0.0-0_b0-API8" + android:versionCode="0" + android:versionName="0.0.0-0_b0-API8" android:installLocation="auto" > diff --git a/scripts/setversion.sh b/scripts/setversion.sh index c55005994fae634e12f1bd9bfa24e10327c6750c..6fb89954898776d60e80c907f9710bbebf5b10e0 100755 --- a/scripts/setversion.sh +++ b/scripts/setversion.sh @@ -66,12 +66,12 @@ echo "Android version: '$VERSIONSTRING' (${VERSIONINT})" echo "my.version.name=${VERSIONSTRING}" > version.properties echo "my.version.code=${VERSIONINT}" >> version.properties -SUBST='s/android.versionCode="[0-9]*"/android.versionCode="'${VERSIONINT}'"/' +SUBST='s/android:versionCode="[0-9]*"/android:versionCode="'${VERSIONINT}'"/' sed "$SUBST" < $MANIFEST > $TMP -SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/' +SUBST='s/android:versionName="[^"]*"/android:versionName="'${VERSIONSTRING}'"/' sed "$SUBST" < $TMP > $MANIFEST -SUBST='s/android.versionCode="[0-9]*"/android.versionCode="'${VERSIONINT}'"/' +SUBST='s/android:versionCode="[0-9]*"/android:versionCode="'${VERSIONINT}'"/' sed "$SUBST" < $MANIFESTROUTER > $TMP -SUBST='s/android.versionName="[^"]*"/android.versionName="'${VERSIONSTRING}'"/' +SUBST='s/android:versionName="[^"]*"/android:versionName="'${VERSIONSTRING}'"/' sed "$SUBST" < $TMP > $MANIFESTROUTER rm -f $TMP