Adds ContentShellTest.apk and very simple test.

This change does a number of things to add a ContentShellTest.apk:
- adds javatests directory with
  - AndroidManifest.xml and content_shell_test_apk.xml to make it
    possible to build ContentShellTest.apk
  - Simple test that just starts the content shell, verifies the
    activity isn't null and that the URL is set as expected.

The simple test is run directly by instruments using the following
command:
adb shell am instrument -w org.chromium.content_shell.tests/android.test.InstrumentationTestRunner

BUG=136700

TEST=


Review URL: https://chromiumcodereview.appspot.com/10700167

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

1 files changed, 28 insertions, 2 deletions

diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 690cb69..875e0e7 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -576,7 +576,7 @@
                 '--strip-unneeded',  # All symbols not needed for relocation.
                 '<@(_inputs)',
                 '-o',
-                '<@(_outputs)' 
+                '<@(_outputs)',
               ],
             },
             {
@@ -597,7 +597,7 @@
                 # Release mode.  I don't think it matters (e.g. we're
                 # probably happy to not codesign) but naming should be
                 # fixed.
-                '<(PRODUCT_DIR)/ContentShell-debug.apk',
+                '<(PRODUCT_DIR)/content_shell/ContentShell-debug.apk',
               ],
               'action': [
                 'ant',
@@ -609,6 +609,32 @@
             }
           ],
         },
+        {
+          'target_name': 'content_shell_test_apk',
+          'type': 'none',
+          'dependencies': [
+            'content_shell_apk',
+          ],
+          'actions': [
+            {
+              'action_name': 'content_shell_test_generate_apk',
+              'inputs': [
+                '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
+                '<(DEPTH)/content/shell/android/javatests/AndroidManifest.xml',
+              ],
+              'outputs': [
+                '<(PRODUCT_DIR)/content_shell_test/ContentShellTest-debug.apk',
+              ],
+              'action': [
+                'ant',
+                '-DPRODUCT_DIR=<(ant_build_out)',
+                '-DAPP_ABI=<(android_app_abi)',
+                '-buildfile',
+                '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
+              ]
+            }
+          ],
+        },
       ],
     }],  # OS=="android"
   ]