Snap for 11400057 from de6749184db7dc184e1a4df4fc3e2291f637f9cf to simpleperf-releasesimpleperf-release

Change-Id: Ib076b9f8ec994344d89bb679fbb39064269b4972

7 files changed, 6 insertions, 12 deletions

diff --git a/Android.bp b/Android.bp
index 4192d0dda972..72752b684292 100644
--- a/Android.bp
+++ b/Android.bp
@@ -447,12 +447,6 @@ cc_defaults {
     local_include_dirs: ["android/include"],
     gtest: false,
     no_named_install_directory: true,
-
-    // FIXME: test fails to build with LTO
-    // http://b/241723066
-    lto: {
-        never: true,
-    },
 }
 
 cc_defaults {
diff --git a/android/kselftest_template.xml b/android/kselftest_template.xml
index b12c857d696a..9f258ceac3a3 100644
--- a/android/kselftest_template.xml
+++ b/android/kselftest_template.xml
@@ -23,7 +23,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_arm_32.xml b/android/vts_linux_kselftest_arm_32.xml
index 7685c6de7485..bef66b14fc60 100644
--- a/android/vts_linux_kselftest_arm_32.xml
+++ b/android/vts_linux_kselftest_arm_32.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_arm_64.xml b/android/vts_linux_kselftest_arm_64.xml
index c96ba6fa4f0d..a665dcd15bde 100644
--- a/android/vts_linux_kselftest_arm_64.xml
+++ b/android/vts_linux_kselftest_arm_64.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_riscv_64.xml b/android/vts_linux_kselftest_riscv_64.xml
index 1f303035ae6a..840fb831d809 100644
--- a/android/vts_linux_kselftest_riscv_64.xml
+++ b/android/vts_linux_kselftest_riscv_64.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_x86_32.xml b/android/vts_linux_kselftest_x86_32.xml
index 807b66d003bf..9b96d16e2dcf 100644
--- a/android/vts_linux_kselftest_x86_32.xml
+++ b/android/vts_linux_kselftest_x86_32.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >
diff --git a/android/vts_linux_kselftest_x86_64.xml b/android/vts_linux_kselftest_x86_64.xml
index 2dd249184004..7fc6c0fb3ab0 100644
--- a/android/vts_linux_kselftest_x86_64.xml
+++ b/android/vts_linux_kselftest_x86_64.xml
@@ -27,7 +27,7 @@
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
         <option name="cleanup" value="true" />
         <option name="push-file" key="{MODULE}" value="&ktest_dir;" />
-        <option name="post-push" value='chmod -R 755 &ktest_dir; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
+        <option name="post-push" value='chmod -R 755 &ktest_dir;; find &ktest_dir; -type f | xargs grep -l -e "bin/sh" -e "bin/bash" | xargs sed -i -e "s?/bin/echo?echo?" -i -e "s?#!/bin/sh?#!/system/bin/sh?" -i -e "s?#!/bin/bash?#!/system/bin/sh?" || echo "There were no files to process"' />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.binary.KernelTargetTest" >