Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Unified Diff: platform_tools/android/app/src/com/skia/SkiaIntentService.java

Issue 15855006: prepare skia for shared library build on android (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: rebasing Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « gyp/xps.gyp ('k') | platform_tools/android/app/src/com/skia/SkiaSampleActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/app/src/com/skia/SkiaIntentService.java
diff --git a/platform_tools/android/app/src/com/skia/SkiaIntentService.java b/platform_tools/android/app/src/com/skia/SkiaIntentService.java
index e2707f796424460bfdd92b31a0d26449ba50d764..68d336e70ee0076ee1fea8a64e89b1f014b9a1db 100644
--- a/platform_tools/android/app/src/com/skia/SkiaIntentService.java
+++ b/platform_tools/android/app/src/com/skia/SkiaIntentService.java
@@ -16,7 +16,7 @@ public class SkiaIntentService extends IntentService {
public SkiaIntentService() {
super("SkiaIntentService");
}
-
+
@Override
public IBinder onBind(Intent arg0) {
return null;
@@ -25,12 +25,12 @@ public class SkiaIntentService extends IntentService {
public void onCreate() {
super.onCreate();
}
-
+
@Override
public void onDestroy() {
super.onDestroy();
}
-
+
@Override
public void onHandleIntent(Intent intent) {
@@ -51,10 +51,11 @@ public class SkiaIntentService extends IntentService {
String cmd = bundle.getString("args").trim();
String[] args = cmd.split("\\s+");
Log.d("skia", "Executing Command: " + cmd);
-
+
// Load the requested library
String lib = args[0];
try {
+ System.loadLibrary("skia_android");
System.loadLibrary(lib);
} catch (UnsatisfiedLinkError e) {
Log.e("skia", "Library " + lib +
@@ -62,7 +63,7 @@ public class SkiaIntentService extends IntentService {
SkiaReturn(-1, returnRepeats);
throw e;
}
-
+
// JNI call to run the program
int retval = run(args);
SkiaReturn(retval, returnRepeats);
« no previous file with comments | « gyp/xps.gyp ('k') | platform_tools/android/app/src/com/skia/SkiaSampleActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698