prepare skia for shared library build on android

R=borenet@google.com, djsollen@google.com

Committed: https://code.google.com/p/skia/source/detail?r=9378

Review URL: https://codereview.chromium.org/15855006

git-svn-id: http://skia.googlecode.com/svn/trunk@9379 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 5 insertions, 7 deletions

diff --git a/platform_tools/android/app/src/com/skia/SkiaIntentService.java b/platform_tools/android/app/src/com/skia/SkiaIntentService.java
index 68d336e70e..e2707f7964 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,11 +51,10 @@ 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 +
@@ -63,7 +62,7 @@ public class SkiaIntentService extends IntentService {
           SkiaReturn(-1, returnRepeats);
           throw e;
       }
-
+      
       // JNI call to run the program
       int retval = run(args);
       SkiaReturn(retval, returnRepeats);
diff --git a/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java b/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java
index 62f81a58f5..4b5e7d6b7f 100644
--- a/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java
+++ b/platform_tools/android/app/src/com/skia/SkiaSampleActivity.java
@@ -42,7 +42,6 @@ public class SkiaSampleActivity extends Activity
         mSlideList = new ArrayAdapter<String>(this, android.R.layout.simple_expandable_list_item_1);
 
         try {
-            System.loadLibrary("skia_android");
             System.loadLibrary("SampleApp");
 
             LinearLayout holder = (LinearLayout) findViewById(R.id.holder);