Android content shell bringup.

Build media java files (we weren't).
Fix adb_install_content_shell for cases where the app was stuck.
Add upstream staging gyp var / #define.
Be more consistent about jar output files (all in lib.java).
Upstream a bunch of random files (e.g. ppapi).
Upstream a bunch of java and native code hit as part of shlib init.
Properly package jar files in content shell.

BUG=
TEST=


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

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

3 files changed, 14 insertions, 2 deletions

diff --git a/build/android/adb_install_content_shell b/build/android/adb_install_content_shell
index b4d8052..d1a8ee9 100755
--- a/build/android/adb_install_content_shell
+++ b/build/android/adb_install_content_shell
@@ -4,4 +4,6 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+# install -r doesn't always work?  Try uninstalling first.
+adb uninstall org.chromium.content_shell
 adb install -r ${CHROME_SRC}/out/Release/content_shell/ContentShell-debug.apk 
diff --git a/build/android/envsetup.sh b/build/android/envsetup.sh
index ead8fdf..dcf51ee 100755
--- a/build/android/envsetup.sh
+++ b/build/android/envsetup.sh
@@ -62,6 +62,14 @@ case "${TARGET_PRODUCT-full}" in
     return 1
 esac
 
+# If we are building NDK/SDK, and in the upstream (open source) tree,
+# define a special variable for bringup purposes.
+case "${ANDROID_BUILD_TOP-undefined}" in
+  "undefined")
+    DEFINES+=" android_upstream_bringup=1"
+    ;;
+esac
+
 toolchain_path="${ANDROID_NDK_ROOT}/toolchains/${toolchain_arch}/prebuilt/"
 export ANDROID_TOOLCHAIN="${toolchain_path}/${toolchain_dir}/bin/"
 
diff --git a/build/android/gdb_content_shell b/build/android/gdb_content_shell
index 54a705d..94c0962 100755
--- a/build/android/gdb_content_shell
+++ b/build/android/gdb_content_shell
@@ -72,8 +72,9 @@ fi
 # gdb commands
 cmdfile=$(mktemp /tmp/gdb_android_XXXXXXXX)
 cat >$cmdfile<<EOF
-set solib-absolute-prefix null
+# set solib-absolute-prefix null
 set solib-search-path ${shared_lib_dir}
+file ${app_process}
 target remote :4321
 EOF
 
@@ -85,5 +86,6 @@ else
   echo Using $gdb
 fi
 
-${gdb} -x $cmdfile $* $app_process
+# ${gdb} -x $cmdfile $* $app_process
+${gdb} -x $cmdfile $*
 rm $cmdfile