summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2013-05-30 03:38:50 -0700
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-05-30 03:38:50 -0700
commit22e672b99044e85b20e3df7b6b610820472ef00c (patch)
treec6aa08c5efcfec58df25e9876d20484e194d9cfd
parent109ecb41c3dfb80d26cf94241f527f6ca6de5ac4 (diff)
parent4733cd7940fec2645fcf237b1a773cdc467ff873 (diff)
downloadpackages_apps_LegacyCamera-22e672b99044e85b20e3df7b6b610820472ef00c.zip
packages_apps_LegacyCamera-22e672b99044e85b20e3df7b6b610820472ef00c.tar.gz
packages_apps_LegacyCamera-22e672b99044e85b20e3df7b6b610820472ef00c.tar.bz2
Merge "LegacyCamera: Load correct panorama JNI libs" into cm-10.1
-rw-r--r--src/com/android/camera/panorama/Mosaic.java2
-rw-r--r--src/com/android/camera/panorama/MosaicRenderer.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/camera/panorama/Mosaic.java b/src/com/android/camera/panorama/Mosaic.java
index 5064cec..90bf2ad 100644
--- a/src/com/android/camera/panorama/Mosaic.java
+++ b/src/com/android/camera/panorama/Mosaic.java
@@ -93,7 +93,7 @@ public class Mosaic {
static {
- System.loadLibrary("jni_mosaic");
+ System.loadLibrary("jni_legacymosaic");
}
/**
diff --git a/src/com/android/camera/panorama/MosaicRenderer.java b/src/com/android/camera/panorama/MosaicRenderer.java
index f055c0e..f4e9abc 100644
--- a/src/com/android/camera/panorama/MosaicRenderer.java
+++ b/src/com/android/camera/panorama/MosaicRenderer.java
@@ -24,7 +24,7 @@ public class MosaicRenderer
{
static
{
- System.loadLibrary("jni_mosaic");
+ System.loadLibrary("jni_legacymosaic");
}
/**