Make Mojo work on Android again

This CL fixes mojo_shell to work on Android again. This time we're using the
static build, which means we don't need to keep track of all the many
components.

R=darin@chromium.org

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239797 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 39 insertions, 1 deletions

diff --git a/mojo/build/package_app.gypi b/mojo/build/package_app.gypi
new file mode 100644
index 0000000..d74cdc3
--- /dev/null
+++ b/mojo/build/package_app.gypi
@@ -0,0 +1,31 @@
+# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'type': 'none',
+  'dependencies': [
+    '<(app_name)',
+  ],
+  'conditions': [
+    ['OS=="android"', {
+      'variables': {
+        'mojo_app_dir': '<(PRODUCT_DIR)/apps',
+        'source_binary': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)<(app_name)<(SHARED_LIB_SUFFIX)',
+        'target_binary': '<(mojo_app_dir)/<(SHARED_LIB_PREFIX)<(app_name)<(SHARED_LIB_SUFFIX)',
+      },
+      'actions': [{
+        'action_name': 'strip',
+        'inputs': [ '<(source_binary)', ],
+        'outputs': [ '<(target_binary)', ],
+        'action': [
+          '<(android_strip)',
+          '<@(_inputs)',
+          '--strip-unneeded',
+          '-o',
+          '<@(_outputs)',
+        ],
+      }],
+    }],
+  ],
+}
diff --git a/mojo/mojo_examples.gypi b/mojo/mojo_examples.gypi
index 08b8896..8796824 100644
--- a/mojo/mojo_examples.gypi
+++ b/mojo/mojo_examples.gypi
@@ -24,6 +24,13 @@
       ],
     },
     {
+      'target_name': 'package_sample_app',
+      'variables': {
+        'app_name': 'sample_app',
+      },
+      'includes': [ 'build/package_app.gypi' ],
+    },
+    {
       'target_name': 'hello_world_bindings',
       'type': 'static_library',
       'sources': [
diff --git a/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java b/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java
index 940776b..93d4c0b 100644
--- a/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java
+++ b/mojo/shell/android/apk/src/org/chromium/mojo_shell_apk/LibraryLoader.java
@@ -14,7 +14,7 @@ public class LibraryLoader {
         if (sInitialized)
             return;
         sInitialized = true;
-        System.loadLibrary("mojo_shell.cr");
+        System.loadLibrary("mojo_shell");
         Log.i(TAG, "libmojo_shell initialization success.");
     }
 }