Relanding "Add apk for running content_browsertests"

Revert "Revert 179189"

This reverts commit 5844ab0c6a41cc9d306f8c355cc7ceb5e290cbb1.

Original CL:https://codereview.chromium.org/12047068/
was reverted as we failed to update the bot scripts with the new package
name for content_shell_apk

TBR=mark@chromium.org,jam@chromium.org
BUG=138275


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

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

8 files changed, 11 insertions, 13 deletions

diff --git a/build/android/adb_gdb_content_shell b/build/android/adb_gdb_content_shell
index d0b6947..18e1a61 100755
--- a/build/android/adb_gdb_content_shell
+++ b/build/android/adb_gdb_content_shell
@@ -12,5 +12,5 @@ export ADB_GDB_PROGNAME=$(basename "$0")
 export ADB_GDB_ACTIVITY=.ContentShellActivity
 "$PROGDIR"/adb_gdb \
     --program-name=ContentShell \
-    --package-name=org.chromium.content_shell \
+    --package-name=org.chromium.content_shell_apk \
     "$@"
diff --git a/build/android/adb_kill_content_shell b/build/android/adb_kill_content_shell
index d24c7a9..64ab5b1 100755
--- a/build/android/adb_kill_content_shell
+++ b/build/android/adb_kill_content_shell
@@ -8,7 +8,7 @@
 #
 # Assumes you have sourced the build/android/envsetup.sh script.
 
-SHELL_PID_LINES=$(adb shell ps | grep ' org.chromium.content_shell')
+SHELL_PID_LINES=$(adb shell ps | grep ' org.chromium.content_shell_apk')
 VAL=$(echo "$SHELL_PID_LINES" | wc -l)
 if [ $VAL -lt 1 ] ; then
    echo "Not running Content shell."
diff --git a/build/android/adb_run_content_shell b/build/android/adb_run_content_shell
index ea92f5a..17a734c 100755
--- a/build/android/adb_run_content_shell
+++ b/build/android/adb_run_content_shell
@@ -10,5 +10,5 @@ fi
 
 adb shell am start \
   -a android.intent.action.VIEW \
-  -n org.chromium.content_shell/.ContentShellActivity \
+  -n org.chromium.content_shell_apk/.ContentShellActivity \
   $INTENT_ARGS
diff --git a/build/android/buildbot/bb_device_steps.py b/build/android/buildbot/bb_device_steps.py
index 98cd640..81e540b 100755
--- a/build/android/buildbot/bb_device_steps.py
+++ b/build/android/buildbot/bb_device_steps.py
@@ -41,7 +41,7 @@ I_TEST = collections.namedtuple('InstrumentationTest', [
 INSTRUMENTATION_TESTS = dict((suite.name, suite) for suite in [
     I_TEST('ContentShell',
            'ContentShell.apk',
-           'org.chromium.content_shell',
+           'org.chromium.content_shell_apk',
            'ContentShellTest',
            'content:content/test/data/android/device_files'),
     I_TEST('ChromiumTestShell',
diff --git a/build/android/gdb_apk b/build/android/gdb_apk
index 7e657d6..41feae6 100755
--- a/build/android/gdb_apk
+++ b/build/android/gdb_apk
@@ -96,7 +96,7 @@ process_options() {
 rooted_phone=0
 
 root=$(dirname $0)/../..
-package_name=org.chromium.content_shell
+package_name=org.chromium.content_shell_apk
 shared_lib_dir=$root/out/${BUILDTYPE:-Debug}/lib.target
 gdb_args=''
 
diff --git a/build/android/gdb_content_shell b/build/android/gdb_content_shell
index c8cb88f..81a1986 100755
--- a/build/android/gdb_content_shell
+++ b/build/android/gdb_content_shell
@@ -12,5 +12,5 @@ adb_gdb_content_shell instead!"
 if [ $# -gt 0 ]; then
   exec ${ROOT}/gdb_apk -r -g "$*"
 else
-  exec ${ROOT}/gdb_apk -r -p org.chromium.content_shell
+  exec ${ROOT}/gdb_apk -r -p org.chromium.content_shell_apk
 fi
diff --git a/build/android/pylib/constants.py b/build/android/pylib/constants.py
index a7845f1..ffcf325 100644
--- a/build/android/pylib/constants.py
+++ b/build/android/pylib/constants.py
@@ -12,8 +12,8 @@ CHROME_ACTIVITY = 'com.google.android.apps.chrome.Main'
 CHROME_TESTS_PACKAGE = 'com.google.android.apps.chrome.tests'
 LEGACY_BROWSER_PACKAGE = 'com.google.android.browser'
 LEGACY_BROWSER_ACTIVITY = 'com.android.browser.BrowserActivity'
-CONTENT_SHELL_PACKAGE = "org.chromium.content_shell"
-CONTENT_SHELL_ACTIVITY = "org.chromium.content_shell.ContentShellActivity"
+CONTENT_SHELL_PACKAGE = "org.chromium.content_shell_apk"
+CONTENT_SHELL_ACTIVITY = "org.chromium.content_shell_apk.ContentShellActivity"
 CHROME_SHELL_PACKAGE = 'org.chromium.chrome.browser.test'
 CHROMIUM_TEST_SHELL_PACKAGE = 'org.chromium.chrome.testshell'
 
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index a887663..fb79797 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -18,12 +18,10 @@
 #   'includes': ['path/to/this/gypi/file'],
 # }
 #
-# Note that this assumes that there's an ant buildfile <package_name>_apk.xml in
-# java_in_dir. So, if you have package_name="content_shell" and
+# If you have package_name="content_shell" and
 # java_in_dir="content/shell/android/java" you should have a directory structure
 # like:
 #
-# content/shell/android/java/content_shell_apk.xml
 # content/shell/android/java/src/org/chromium/base/Foo.java
 # content/shell/android/java/src/org/chromium/base/Bar.java
 #
@@ -41,8 +39,8 @@
 #    each directory in additional_res_dirs.
 #  additional_src_dirs - Additional directories with .java files to be compiled
 #    and included in the output of this target.
-#  asset_location - The directory where assets are located (default:
-#    <PRODUCT_DIR>/<package_name>/assets).
+#  asset_location - The absolute path to the directory where assets are located
+#    (default: <(ant_build_out)/<(package_name)/assets).
 #  generated_src_dirs - Same as additional_src_dirs except used for .java files
 #    that are generated at build time. This should be set automatically by a
 #    target's dependencies. The .java files in these directories are not