diff options
author | Thomas Martitz <kugel@rockbox.org> | 2014-03-09 18:08:06 +0100 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2014-03-09 18:11:35 +0100 |
commit | 6499ce3e445e1acc5f5707fd164ad5e3c5ab0a43 (patch) | |
tree | 3e1cb19678e5ce9bfd5681d944193ede902805b6 /android/src/org | |
parent | 2a71c0853304b68835fcf87d2bae8295d64abd6c (diff) | |
download | rockbox-6499ce3e445e1acc5f5707fd164ad5e3c5ab0a43.tar.gz rockbox-6499ce3e445e1acc5f5707fd164ad5e3c5ab0a43.zip |
android: Get the port up and running again
The build system needed fixes because the tools paths changed and one tool that
we used (apkbuilder) was removed entirely. Recent NDKs don't ship gcc 4.4.3
anymore, therefore switch to 4.6. The code itself needed a fix for a jni
reference bug that was uncovered by KitKat.
The port now builds with latest sdk (r22) and ndk (r9d).
Change-Id: Id74fa54ba93bbb0ee30373fbe79e92c5ff03201d
Diffstat (limited to 'android/src/org')
-rw-r--r-- | android/src/org/rockbox/RockboxFramebuffer.java | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/android/src/org/rockbox/RockboxFramebuffer.java b/android/src/org/rockbox/RockboxFramebuffer.java index e1fb99f2a1..405a771274 100644 --- a/android/src/org/rockbox/RockboxFramebuffer.java +++ b/android/src/org/rockbox/RockboxFramebuffer.java | |||
@@ -57,14 +57,6 @@ public class RockboxFramebuffer extends SurfaceView | |||
57 | setEnabled(false); | 57 | setEnabled(false); |
58 | } | 58 | } |
59 | 59 | ||
60 | /* second stage init; called from Rockbox with information about the | ||
61 | * display framebuffer */ | ||
62 | private void initialize(int lcd_width, int lcd_height) | ||
63 | { | ||
64 | btm = Bitmap.createBitmap(lcd_width, lcd_height, Bitmap.Config.RGB_565); | ||
65 | setEnabled(true); | ||
66 | } | ||
67 | |||
68 | private void update(ByteBuffer framebuffer) | 60 | private void update(ByteBuffer framebuffer) |
69 | { | 61 | { |
70 | SurfaceHolder holder = getHolder(); | 62 | SurfaceHolder holder = getHolder(); |
@@ -138,5 +130,7 @@ public class RockboxFramebuffer extends SurfaceView | |||
138 | public native void surfaceDestroyed(SurfaceHolder holder); | 130 | public native void surfaceDestroyed(SurfaceHolder holder); |
139 | public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) | 131 | public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) |
140 | { | 132 | { |
133 | btm = Bitmap.createBitmap(width, height, Bitmap.Config.RGB_565); | ||
134 | setEnabled(true); | ||
141 | } | 135 | } |
142 | } | 136 | } |