Revert "Make sure unwind tables are added for 32 bit libraries in arm64 monochrome"

This reverts commit 200a953f.

Reason for revert: Breaking official build due to APK merge.

Original change's description:
> Make sure unwind tables are added for 32 bit libraries in arm64 monochrome
> 
> The assets were not added since we checked "can_unwind_with_cfi_table"
> value, which depends on "build_secondary_abi" build arg. So, explicitly
> add the asset for 64-bit monochrome apk, which contains 32 bit library.
> 
> BUG=924842
> 
> Change-Id: I6488d5c4e5a80787735c5b09134b013a87b5c553
> Reviewed-on: https://chromium-review.googlesource.com/c/1432836
> Commit-Queue: ssid <ssid@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#625789}

TBR=ssid@chromium.org,agrieve@chromium.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: 924842
Change-Id: Ic8e542cc1cf52f24b7866c1620ac764bf2f92672
Reviewed-on: https://chromium-review.googlesource.com/c/1439074Reviewed-by: Ben Mason <benmason@chromium.org>
Commit-Queue: Ben Mason <benmason@chromium.org>
Cr-Commit-Position: refs/heads/master@{#626505}

build/config/android/extract_unwind_tables.gni

@@ -14,24 +14,18 @@ template("unwind_table_asset") {
       testonly = invoker.testonly
     }
 
-    _root_dir = "$root_out_dir"
-    if (build_apk_secondary_abi && defined(android_secondary_abi_cpu)) {
-      _root_dir = get_label_info(":foo($android_secondary_abi_toolchain)",
-                                 "root_out_dir")
-    }
-
     script = "//build/android/gyp/extract_unwind_tables.py"
     outputs = [
       _asset_path,
     ]
     inputs = [
-      "${_root_dir}/lib.unstripped/$shlib_prefix${invoker.library_target}$shlib_extension",
+      "$root_out_dir/lib.unstripped/$shlib_prefix${invoker.library_target}$shlib_extension",
     ]
 
     args = [
       "--input_path",
       rebase_path(
-          "${_root_dir}/lib.unstripped/$shlib_prefix${invoker.library_target}$shlib_extension",
+          "$root_out_dir/lib.unstripped/$shlib_prefix${invoker.library_target}$shlib_extension",
           root_build_dir),
       "--output_path",
       rebase_path(_asset_path, root_build_dir),

chrome/android/BUILD.gn

@@ -1407,9 +1407,8 @@ static_library("browser_test_support") {
 
 # Unwind tables are added to only official builds (public_apk(s)) so that
 # developer builds are not affected.
-_add_unwind_tables_in_chrome_32bit_apk =
-    is_android && !is_component_build && is_official_build &&
-    (target_cpu == "arm" || target_cpu == "arm64")
+_add_unwind_tables_in_chrome_public_apk =
+    can_unwind_with_cfi_table && is_official_build
 
 # Defines a target that derives from the chrome public application. This
 # can be either an APK or an app bundle module. This supports both the
@@ -1463,9 +1462,8 @@ template("chrome_public_apk_or_module_tmpl") {
     }
 
     shared_libraries = [ ":libchrome${_suffix}" ]
-    add_unwind_tables_in_apk =
-        _add_unwind_tables_in_chrome_32bit_apk && target_cpu == "arm"
-    if (add_unwind_tables_in_apk) {
+    add_unwind_tables_in_apk = _add_unwind_tables_in_chrome_public_apk
+    if (_add_unwind_tables_in_chrome_public_apk) {
       shared_library_for_unwind_asset = "chrome${_suffix}"
     }
 
@@ -1577,10 +1575,8 @@ template("monochrome_public_apk_or_module_tmpl") {
       "//chrome/android:chrome_java",
     ]
 
-    _needs_arm32_lib = target_cpu == "arm" ||
-                       (target_cpu == "arm64" && build_apk_secondary_abi)
     add_unwind_tables_in_apk =
-        _add_unwind_tables_in_chrome_32bit_apk && _needs_arm32_lib &&
+        _add_unwind_tables_in_chrome_public_apk &&
         (!defined(use_trichrome_library) || !use_trichrome_library)
 
     version_name = chrome_version_name
@@ -1688,9 +1684,8 @@ template("chrome_test_apk_tmpl") {
 
     testonly = true
     target_type = "instrumentation_test_apk"
-    add_unwind_tables_in_apk =
-        _add_unwind_tables_in_chrome_32bit_apk && target_cpu == "arm"
-    if (add_unwind_tables_in_apk) {
+    add_unwind_tables_in_apk = _add_unwind_tables_in_chrome_public_apk
+    if (_add_unwind_tables_in_chrome_public_apk) {
       shared_library_for_unwind_asset = "chromefortest"
     }
 

chrome/android/chrome_public_apk_tmpl.gni

@@ -96,9 +96,6 @@ template("chrome_public_common_apk_or_module_tmpl") {
 
       library_target = invoker.shared_library_for_unwind_asset
       deps = invoker.shared_libraries
-      if (defined(invoker.secondary_abi_shared_libraries)) {
-        deps += invoker.secondary_abi_shared_libraries
-      }
     }
   }