Enable a newly passing trunk test and disable a flaky 6.2 test on armv7

Author: finagolfin

swift-ci/sdks/android/patches/swift-android-devel.patch

@@ -23,6 +23,17 @@ index 01390761c8c..d84c142397c 100644
 
  // NOTE: 25185.byteSwapped = 0x62 'a', 0x61 'b'
  // CHECK-LABEL: test_ascii_scalar_scalar2
+diff --git a/swift/test/SourceKit/CompileNotifications/edits.swift b/swift/test/SourceKit/CompileNotifications/edits.swift
+index dcc4698c15c..686ef4459d6 100644
+--- a/swift/test/SourceKit/CompileNotifications/edits.swift
++++ b/swift/test/SourceKit/CompileNotifications/edits.swift
+@@ -1,5 +1,5 @@
+ // rdar://108082630 this test is flaky in ASAN bot
+-// UNSUPPORTED: asan
++// UNSUPPORTED: asan, OS=linux-androideabi
+ 
+ // RUN: %sourcekitd-test -req=track-compiles \
+ // RUN:     == -req=sema %s -- %s \
 diff --git a/swift/utils/swift_build_support/swift_build_support/products/cmake_product.py b/swift/utils/swift_build_support/swift_build_support/products/cmake_product.py
 index dc338334f28..f1a9f4d28bf 100644
 --- a/swift/utils/swift_build_support/swift_build_support/products/cmake_product.py

swift-ci/sdks/android/patches/swift-android-trunk.patch

@@ -10,6 +10,18 @@ index 3f36fc979cb..8713ae8fea8 100755
              "grep",
              "--extended-regexp",
              "--recursive",
+diff --git a/swift/test/SILOptimizer/dead_array_elim.swift b/swift/test/SILOptimizer/dead_array_elim.swift
+index a15d6aa2254..8426e66c7e0 100644
+--- a/swift/test/SILOptimizer/dead_array_elim.swift
++++ b/swift/test/SILOptimizer/dead_array_elim.swift
+@@ -2,7 +2,6 @@
+ 
+ // REQUIRES: swift_stdlib_no_asserts
+ // REQUIRES: swift_in_compiler
+-// XFAIL: OS=linux-androideabi
+ 
+ // These tests check whether DeadObjectElimination pass runs as a part of the
+ // optimization pipeline and eliminates dead array literals in Swift code.
 diff --git a/swift/utils/swift_build_support/swift_build_support/products/cmake_product.py b/swift/utils/swift_build_support/swift_build_support/products/cmake_product.py
 index 6d0aae32835..3713086fec3 100644
 --- a/swift/utils/swift_build_support/swift_build_support/products/cmake_product.py