devraza/rustboyadvance-ng
Archived
1
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Android: Fix build

Browse source 
Former-commit-id: 719e9ea62eafb45c238f551591567005f603190d
This commit is contained in:
Michel Heily 2020-04-10 17:24:57 +03:00
parent 56c3c5ce3b
commit 6db7c565b7
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
platform/android/app/build.gradle
View file

@ -25,8 +25,8 @@ cargo {
prebuiltToolchains = true prebuiltToolchains = true
verbose = true verbose = true
profile = 'release' profile = 'release'
module = "../../bindings/rustboyadvance-jni" module = "../../../bindings/rustboyadvance-jni"
targetDirectory = '../../target' targetDirectory = '../../../target'
libname = "rustboyadvance_jni" libname = "rustboyadvance_jni"
targets = ['x86', 'arm64'] targets = ['x86', 'arm64']
apiLevel = 21 apiLevel = 21

1
platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/EmulatorActivity.java
View file

@ -363,7 +363,6 @@ public class EmulatorActivity extends AppCompatActivity implements View.OnClickL
findViewById(R.id.bDpadDown).setOnTouchListener(this); findViewById(R.id.bDpadDown).setOnTouchListener(this);
findViewById(R.id.bDpadLeft).setOnTouchListener(this); findViewById(R.id.bDpadLeft).setOnTouchListener(this);
findViewById(R.id.bDpadRight).setOnTouchListener(this); findViewById(R.id.bDpadRight).setOnTouchListener(this);
findViewById(R.id.dpad_layout).setOnTouchListener(this);
turboButton = findViewById(R.id.tbTurbo); turboButton = findViewById(R.id.tbTurbo);
turboButton.setOnClickListener(this); turboButton.setOnClickListener(this);

2
platform/android/app/src/main/java/com/mrmichel/rustdroid_emu/ui/library/RomListItemAdapter.java
View file

@ -49,7 +49,7 @@ public class RomListItemAdapter extends ArrayAdapter<RomMetadataEntry> {
if (screenshot != null) { if (screenshot != null) {
screenshotImageView.setImageBitmap(screenshot); screenshotImageView.setImageBitmap(screenshot);
} else { } else {
screenshotImageView.setImageBitmap(BitmapFactory.decodeResource(context.getResources(), R.drawable.icon)); screenshotImageView.setImageBitmap(BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher));
} }