summaryrefslogtreecommitdiff
path: root/platform/android
diff options
context:
space:
mode:
authorfred ross-perry <fredross-perry@Fred-Ross-Perrys-Computer.local>2016-07-14 16:05:15 -0700
committerfred ross-perry <fred.ross-perry@artifex.com>2016-07-15 09:36:56 -0700
commitcb78b5c6782f14a699f90bd5621cd3656a1e02ea (patch)
tree47b83072ff5fb133f8d4ac9ff32992e464234f86 /platform/android
parente47769cf2bc9feb30c074c965883f9662540ab3b (diff)
downloadmupdf-cb78b5c6782f14a699f90bd5621cd3656a1e02ea.tar.xz
java - move fitz sources into a 'src' subfolder.
Diffstat (limited to 'platform/android')
-rw-r--r--platform/android/example/mupdf/build.gradle3
-rw-r--r--platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocPageView.java2
-rw-r--r--platform/android/example/mupdf/src/main/java/com/artifex/mupdf/fitz/AndroidDrawDevice.java25
3 files changed, 2 insertions, 28 deletions
diff --git a/platform/android/example/mupdf/build.gradle b/platform/android/example/mupdf/build.gradle
index 44a5a895..07455d1e 100644
--- a/platform/android/example/mupdf/build.gradle
+++ b/platform/android/example/mupdf/build.gradle
@@ -22,8 +22,7 @@ android {
main {
java {
// we're getting java sources from two places
- srcDirs = ["src/main/java", "../../../java/com"]
- exclude "example/*"
+ srcDirs = ["src/main/java", "../../../java/src"]
}
jni.srcDirs = [] // This prevents the auto generation of Android.mk
jniLibs.srcDir 'libs' // where to find the .so file(s)
diff --git a/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocPageView.java b/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocPageView.java
index 95eb4cdb..6675689b 100644
--- a/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocPageView.java
+++ b/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/android/DocPageView.java
@@ -13,7 +13,7 @@ import android.view.KeyEvent.Callback;
import android.view.View;
import android.view.ViewGroup;
-import com.artifex.mupdf.fitz.AndroidDrawDevice;
+import com.artifex.mupdf.fitz.android.AndroidDrawDevice;
import com.artifex.mupdf.fitz.Cookie;
import com.artifex.mupdf.fitz.DisplayList;
import com.artifex.mupdf.fitz.DisplayListDevice;
diff --git a/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/fitz/AndroidDrawDevice.java b/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/fitz/AndroidDrawDevice.java
deleted file mode 100644
index 407ddae1..00000000
--- a/platform/android/example/mupdf/src/main/java/com/artifex/mupdf/fitz/AndroidDrawDevice.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.artifex.mupdf.fitz;
-
-import android.graphics.Bitmap;
-
-import com.artifex.mupdf.fitz.NativeDevice;
-import com.artifex.mupdf.fitz.RectI;
-
-public final class AndroidDrawDevice extends NativeDevice
-{
- // NOT static.
- private native long newNative(Bitmap bitmap, int pageX0, int pageY0, int pageX1, int pageY1, int patchX0, int patchY0, int patchX1, int patchY1);
-
- // Construction
- public AndroidDrawDevice(Bitmap bitmap, int pageX0, int pageY0, int pageX1, int pageY1, int patchX0, int patchY0, int patchX1, int patchY1)
- {
- super(0);
- pointer = newNative(bitmap, pageX0, pageY0, pageX1, pageY1, patchX0, patchY0, patchX1, patchY1);
- }
-
- public AndroidDrawDevice(Bitmap bitmap, RectI page, RectI patch)
- {
- super(0);
- pointer = newNative(bitmap, page.x0, page.y0, page.x1, page.y1, patch.x0, patch.y0, patch.x1, patch.y1);
- }
-}