more android fixes

arm/android/android_ARM32_args.gn

@@ -16,7 +16,7 @@ is_official_build = true
 is_high_end_android = false
 use_relr_relocations = false
 optimize_for_size = false
-optimize_for_speed = true
+# optimize_for_speed = true
 is_debug = false
 is_java_debug = false
 debuggable_apks = false

arm/android/android_ARM64_args.gn

@@ -16,7 +16,7 @@ is_official_build = true
 is_high_end_android = true
 use_relr_relocations = true
 optimize_for_size = false
-optimize_for_speed = true
+# optimize_for_speed = true
 is_debug = false
 is_java_debug = false
 debuggable_apks = false

src/build/config/android/BUILD.gn

@@ -46,7 +46,6 @@ config("compiler") {
     # Reduce the page size from 65536 in order to reduce binary size slightly
     # by shrinking the alignment gap between segments. This also causes all
     # segments to be mapped adjacently, which breakpad relies on.
-    cflags += [ "-mfloat-abi=hard", "-march=armv8-a+simd", "-mfpu=neon", ]
     ldflags += [ "-Wl,-z,max-page-size=4096" ]
   }
 
@@ -60,10 +59,6 @@ config("compiler") {
     }
   }
 
-  if (current_cpu == "arm") {
-    cflags += [ "-march=armv7-a", ]
-  }
-
   # Instead of using an unwind lib from the toolchain,
   # buildtools/third_party/libunwind will be built and used directly.
   ldflags += [ "--unwindlib=none" ]
@@ -79,6 +74,16 @@ config("compiler") {
   cflags += [ "--target=$android_abi_target$compile_api_level" ]
   ldflags += [ "--target=$android_abi_target$compile_api_level" ]
 
+  if (current_cpu == "arm64" || target_cpu == "arm64") {
+    cflags += [ "-march=armv8-a+simd", "-mfloat-abi=hard", "-mfpu=neon" ]
+    ldflags += [ "-march=armv8-a+simd" ]
+  }
+
+  if (current_cpu == "arm" || target_cpu == "arm") {
+    cflags += [ "-march=armv7-a" ]
+    ldflags += [ "-march=armv7-a" ]
+  }
+
   # Assign any flags set for the C compiler to asmflags so that they are sent
   # to the assembler.
   asmflags = cflags

src/content/shell/android/BUILD.gn

@@ -226,7 +226,6 @@ content_shell_apk_tmpl("content_shell_test_apk") {
     "//base:base_javatests",
     "//content/public/android:content_javatests",
     "//net/android:net_javatests",
-    "//third_party/android_support_test_runner:runner_java",
   ]
   data_deps = [ "//testing/buildbot/filters:content_shell_test_apk_filters" ]
   if (enable_chrome_android_internal) {
@@ -250,8 +249,7 @@ android_library("content_shell_test_java") {
     "//content/public/test/android:content_java_test_support",
     "//content/shell/android:content_shell_java",
     "//mojo/public/java/system:test_support_java",
-    "//third_party/android_support_test_runner:rules_java",
-    "//third_party/android_support_test_runner:runner_java",
+    "//third_party/androidx:androidx_test_monitor_java",
     "//third_party/androidx:androidx_test_runner_java",
     "//third_party/hamcrest:hamcrest_java",
     "//third_party/junit:junit",