Minor fixes for profiling - part III

tools-webrtc/android/profiling/perf_setup.sh

 #!/bin/bash
 
 # Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 #
@@ skipping 109 matching lines @@
 } 1> /dev/null
 
 # Download the correct version of 'simpleperf' to $DEV_TMP_DIR
 # on the device and enable profiling.
 function copy_simpleperf_to_device() {
   local perf_binary
   [[ $(dev_arch) == "aarch64" ]] \
     && perf_binary="/arm64/simpleperf" \
     || perf_binary="/arm/simpleperf"
   local simpleperf="${DEV_TMP_DIR}/simpleperf"
-  # Avoid copying to device if simpleperf already exists.
-  if [[ ! $(dev_ls "${simpleperf}") ]]; then
-    adb push "${SIMPLE_PERF_DIR}${perf_binary}" "${DEV_TMP_DIR}"
-    adb shell chmod a+x $simpleperf
-  fi
+  # Copy the simpleperf binary from local host to temp folder on device.
+  adb push "${SCRIPT_DIR}/simpleperf/bin/android${perf_binary}" \
+    "${DEV_TMP_DIR}" 1> /dev/null
+  adb shell chmod a+x $simpleperf
   # Enable profiling on the device.
   enable_profiling
   # Allows usage of running report commands on the device.
-  enable_report_symbols
+  if image_is_root; then
+    enable_report_symbols
+  fi
 }
 
 # Copy the recorded 'perf.data' file from the device to the current directory.
 # TODO(henrika): add support for specifying the destination.
 function pull_perf_data_from_device() {
   adb pull "${DEV_TMP_DIR}/perf.data" .
 } 1> /dev/null
 
 
 # Wraps calls to simpleperf report. Used by e.g. perf_report_threads.
@@ skipping 311 matching lines @@
 
   cleanup
 
   return 0
 }
 
 # Only call main() if proper input parameter has been provided.
 if is_set $BUILD_DIR; then
   main "$@"
 fi