diff options
| author | agrieve <agrieve@chromium.org> | 2015-06-01 13:52:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-01 20:53:18 +0000 |
| commit | c481d6771df7cfd731ab174b561388fca8596ce1 (patch) | |
| tree | 6ebae63d3b98d795c1791b60e1fcb757e645fe8b /build/android/adb_content_shell_command_line | |
| parent | f6177a015283f56441b72fe08eabacce3a950f7d (diff) | |
| download | chromium_src-c481d6771df7cfd731ab174b561388fca8596ce1.zip chromium_src-c481d6771df7cfd731ab174b561388fca8596ce1.tar.gz chromium_src-c481d6771df7cfd731ab174b561388fca8596ce1.tar.bz2 | |
Fix adb_chrome_public_command_line for Android M & refactor into a helper .sh
BUG=493878
Review URL: https://codereview.chromium.org/1165753002
Cr-Commit-Position: refs/heads/master@{#332263}
Diffstat (limited to 'build/android/adb_content_shell_command_line')
| -rwxr-xr-x | build/android/adb_content_shell_command_line | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/build/android/adb_content_shell_command_line b/build/android/adb_content_shell_command_line index f3c1d4f..2ac7ece 100755 --- a/build/android/adb_content_shell_command_line +++ b/build/android/adb_content_shell_command_line @@ -13,25 +13,8 @@ # To remove all content shell flags, pass an empty string for the flags: # adb_content_shell_command_line "" +. $(dirname $0)/adb_command_line_functions.sh CMD_LINE_FILE=/data/local/tmp/content-shell-command-line - -if [ $# -eq 0 ] ; then - # If nothing specified, print the command line (stripping off "content_shell") - tempfile=$(tempfile) - adb pull $CMD_LINE_FILE $tempfile 2>/dev/null - if [ $? -eq 0 ] ; then - rm $tempfile - adb shell cat $CMD_LINE_FILE | cut -d " " -f "2-" 2>/dev/null - fi -elif [ $# -eq 1 ] && [ "$1" = '' ] ; then - # If given an empty string, delete the command line. - set -x - adb shell rm $CMD_LINE_FILE >/dev/null -else - # Else set it. - set -x - adb shell "echo 'content_shell $*' > $CMD_LINE_FILE" - # Prevent other apps from modifying flags -- this can create security issues. - adb shell chmod 0664 $CMD_LINE_FILE -fi +REQUIRES_SU=0 +set_command_line "$@" |