commit 30cab56de921f5be2d24c2e83bcd4ad5631b2d9b
author Shuhei Takahashi <nya@chromium.org> Wed Jun 29 05:22:16 2016
committer chrome-bot <chrome-bot@chromium.org> Fri Jul 01 12:16:49 2016
tree 416c139f572cca8118fc92424af9220d7fd361ee
parent 76475bb60c7fa2c2522c27e2c63c9dbbe5de73d7

Do not copy android-data in generate_logs.

android-data directory contains a lot of user data, not
limited to logs. We might want to keep some of logs under
that directory, but for now just omit the whole directory.

BUG=b:29827629
TEST=Generated .tar.gz does not contain android-data.

Change-Id: Ic80a9e9cdac9686c893f6b8559f3483b5a0f1bab
Reviewed-on: https://chromium-review.googlesource.com/356930
Commit-Ready: Shuhei Takahashi <nya@chromium.org>
Tested-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Junichi Uekawa <uekawa@chromium.org>

generate_logs

diff --git a/generate_logs b/generate_logs
index 87d6997..d0ef2cf 100755
--- a/generate_logs
+++ b/generate_logs
@@ -144,7 +144,15 @@
   mkdir ${user_log_dir}/chrome_logs
   mkdir ${user_log_dir}/system_logs
   $COPY -r ${user_home_dir}/log/* ${user_log_dir}/chrome_logs
-  sudo $COPY -r ${user_root_dir}/ ${user_log_dir}/system_logs
+  for subdir in $(ls -A ${user_root_dir}); do
+    case "${subdir}" in
+      android-data)
+        ;;  # skip
+      *)
+        sudo $COPY -r ${user_root_dir}/${subdir} ${user_log_dir}/system_logs/
+        ;;
+    esac
+  done
   if [ -e ${user_home_dir}/crash ]; then
     mkdir ${user_log_dir}/crash
     sudo $COPY -r ${user_home_dir}/crash/* ${user_log_dir}/crash &&