Drop cfi support

uazo · Sep 13, 2023 · 579060f · 579060f
1 parent 38b0ece
commit 579060f
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 37 deletions.
diff --git a/build/bromite.gn_args b/build/bromite.gn_args
@@ -26,7 +26,6 @@ enable_vr=false
 exclude_unwind_tables=false
 ffmpeg_branding="Chrome"
 icu_use_data_file=true
-is_cfi=true
 is_component_build=false
 is_debug=false
 is_official_build=true
@@ -36,7 +35,6 @@ symbol_level=1
 system_webview_package_name="org.bromite.webview"
 target_os="android"
 treat_warnings_as_errors=true
-use_cfi_cast=true
 use_debug_fission=true
 use_errorprone_java_compiler=false
 use_gnome_keyring=false

diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt
@@ -204,7 +204,6 @@ Add-kill-switch-for-unsupported-clangd-flags.patch
 00WIN-Add-some-prefs-to-secure-preferences.patch
 00WIN-Disable-search-for-image.patch
 
-00Remove-experimental-relative-c---abi-vtables.patch
 AudioBuffer-AnalyserNode-fp-mitigations.patch
 00Disable-Component-Updates.patch
 00add-browser-policy.patch

diff --git a/build/patches/00Remove-experimental-relative-c---abi-vtables.patch b/build/patches/00Remove-experimental-relative-c---abi-vtables.patch
diff --git a/tools/images/bromite-build/build_args.gni b/tools/images/bromite-build/build_args.gni
@@ -31,14 +31,8 @@ if (target_os == "android") {
     symbol_level = 1
     strip_debug_info = false
     generate_linker_map = false
-
-    # since is_cfi require use_thin_lto
-    # but not work in debug mode
-    is_cfi = false # disable it
-    use_cfi_cast = false # disable it
   } else {
     generate_linker_map = true
-    use_relative_vtables_abi = false
   }
 }