Snap for 6805133 from 949efeff46b9e960fc8dd64a533b011b642b2f20 to pie-cts-releaseandroid-cts-9.0_r20android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14pie-cts-release

Change-Id: I82ae56b3ac53d5a8fe562fbb7afe515ba7104781

1 files changed, 13 insertions, 0 deletions

diff --git a/test/end_to_end_integrationtest.cc b/test/end_to_end_integrationtest.cc
index 289f65dd0..d8a1ffd95 100644
--- a/test/end_to_end_integrationtest.cc
+++ b/test/end_to_end_integrationtest.cc
@@ -21,6 +21,8 @@
 #include <random>
 #include <thread>
 
+#include <sys/system_properties.h>
+
 #include "gtest/gtest.h"
 #include "perfetto/base/build_config.h"
 #include "perfetto/base/logging.h"
@@ -47,6 +49,14 @@ namespace perfetto {
 #define TEST_PRODUCER_SOCK_NAME ::perfetto::GetProducerSocket()
 #endif
 
+bool IsX86() {
+  char buf[PROP_VALUE_MAX + 1] = {};
+  int ret = __system_property_get("ro.product.cpu.abi", buf);
+  PERFETTO_CHECK(ret >= 0);
+  std::string abi(buf);
+  return abi.find("x86") != std::string::npos;
+}
+
 // TODO(b/73453011): reenable this on more platforms (including standalone
 // Android).
 #if PERFETTO_BUILDFLAG(PERFETTO_ANDROID_BUILD)
@@ -55,6 +65,9 @@ namespace perfetto {
 #define MAYBE_TestFtraceProducer DISABLED_TestFtraceProducer
 #endif
 TEST(PerfettoTest, MAYBE_TestFtraceProducer) {
+  if (IsX86())
+    return;
+
   base::TestTaskRunner task_runner;
 
   TestHelper helper(&task_runner);