Skip to content

Commit 6315358

Browse files
committed
fix android according to fucking google
1 parent 42fd693 commit 6315358

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ www-test/
2424
## Android Studio and Intellij and Android in general
2525
android/libs/armeabi/
2626
android/libs/armeabi-v7a/
27+
android/libs/arm64-v8a/
2728
android/libs/x86/
29+
android/libs/x86_64/
2830
android/gen/
2931
android/**/*.sqlite
3032
.idea/

android/AndroidManifest.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="ch.asynk.rustanddust.android"
4-
android:versionCode="31"
4+
android:versionCode="35"
55
android:versionName="1.0.1" >
66

7-
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="20" />
8-
<uses-permission android:name="android.permission.GET_ACCOUNTS"/>
9-
<uses-permission android:name="android.permission.READ_CONTACTS" />
7+
<uses-sdk android:minSdkVersion="8" android:targetSdkVersion="28" />
8+
<!-- <uses-permission android:name="android.permission.GET_ACCOUNTS"/> -->
9+
<!-- <uses-permission android:name="android.permission.READ_CONTACTS" /> -->
1010

1111
<application
1212
android:allowBackup="true"

core/src/ch/asynk/rustanddust/RustAndDust.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
public class RustAndDust extends Game
2525
{
26-
public static final String VERSION = "v31";
26+
public static final String VERSION = "v35";
2727

2828
public static final String BG_PATCH = "bg";
2929
public static final String FRAME_PATCH = "frame";

run

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ ARGS="desktop:run"
55
ALIAS=jeyzu
66
KEYSTORE="/home/jeyzu/etc/sync/jeyzu-key.keystore"
77
APK="./android/build/apk/android-release-unsigned.apk"
8-
ZIPALIGN="/opt/android-sdk/build-tools/23.0.3/zipalign"
8+
ZIPALIGN="/opt/android-sdk/build-tools/28.0.3/zipalign"
99
APK_OUT="./RustAndDust-signed-aligned.apk"
1010
DB_FILES="./android/assets/data/*.sqlite"
1111

12+
export ANDROID_HOME=/opt/android-sdk
13+
1214
function gradlew_do()
1315
{
1416
echo "./gradlew $ARGS" && ./gradlew $ARGS || exit 1

0 commit comments

Comments
 (0)