Enable cfi for libxaac am: 33385d02d2

Original change: https://android-review.googlesource.com/c/platform/external/libxaac/+/1518098

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfa9ec173eeadfbc408c43fce99d707d4f82470a

2 files changed, 19 insertions, 121 deletions

diff --git a/Android.bp b/Android.bp
index ca47ca0..f189458 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,14 +2,14 @@ cc_library_static {
     name: "libxaacdec",
 
     vendor_available: true,
-    host_supported:true,
+    host_supported: true,
     cflags: [
-        "-O3"
+        "-O3",
     ],
 
     export_include_dirs: [
         "decoder",
-        "decoder/drc_src"
+        "decoder/drc_src",
     ],
 
     srcs: [
@@ -124,15 +124,26 @@ cc_library_static {
         "decoder/drc_src/impd_drc_static_payload.c",
     ],
 
+    target: {
+        android: {
+            sanitize: {
+                diag: {
+                    cfi: true,
+                },
+            },
+        },
+    },
+
     sanitize: {
         misc_undefined: [
             "unsigned-integer-overflow",
             "signed-integer-overflow",
             "bounds",
         ],
-        // Enable CFI if this becomes a shared library.
-        // cfi: true,
-        blocklist: "libxaac_blocklist.txt",
+        cfi: true,
+        config: {
+            cfi_assembly_support: true,
+        },
     },
 
     arch: {
@@ -213,9 +224,9 @@ cc_library_static {
                     "decoder/armv7/ixheaacd_aac_ld_dec_rearrange.s",
                     "decoder/armv7/ixheaacd_fft32x32_ld2_armv7.s",
                     "decoder/armv7/ixheaacd_apply_scale_fac.s",
-                    "decoder/armv7/ixheaacd_tns_ar_filter_fixed.s"
+                    "decoder/armv7/ixheaacd_tns_ar_filter_fixed.s",
                 ],
-            }
+            },
         },
 
         arm64: {
diff --git a/libxaac_blocklist.txt b/libxaac_blocklist.txt
deleted file mode 100644
index 5943f5c..0000000
--- a/libxaac_blocklist.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-[cfi]
-# CFI blacklist for external/libxaac
-
-# assembly functions where CFI has issues
-fun:ixheaacd_fix_div_armv7
-fun:ixheaacd_covariance_matrix_calc_armv7
-fun:ixheaacd_covariance_matrix_calc_2_armv7
-fun:ixheaacd_over_lap_add1_armv7
-fun:ixheaacd_over_lap_add2_armv7
-fun:ixheaacd_decorr_filter2_armv7
-fun:ixheaacd_decorr_filter1_armv7
-fun:ixheaacd_divide16_pos_armv7
-fun:ixheaacd_decorrelation_armv7
-fun:ixheaacd_apply_rot_armv7
-fun:ixheaacd_conv_ergtoamplitudelp_armv7
-fun:ixheaacd_conv_ergtoamplitude_armv7
-fun:ixheaacd_adjust_scale_armv7
-fun:ixheaacd_expsubbandsamples_armv7
-fun:ixheaacd_enery_calc_per_subband_armv7
-fun:ixheaacd_harm_idx_zerotwolp_armv7
-fun:ixheaacd_tns_ar_filter_fixed_armv7
-fun:ixheaacd_tns_ar_filter_armv7
-fun:ixheaacd_tns_parcor_lpc_convert_armv7
-fun:ixheaacd_calc_max_spectral_line_armv7
-fun:ixheaacd_post_twiddle_armv7
-fun:ixheaacd_post_twid_overlap_add_armv7
-fun:ixheaacd_neg_shift_spec_armv7
-fun:ixheaacd_spec_to_overlapbuf_armv7
-fun:ixheaacd_overlap_buf_out_armv7
-fun:ixheaacd_overlap_out_copy_armv7
-fun:ixheaacd_pretwiddle_compute_armv7
-fun:ixheaacd_imdct_using_fft_armv7
-fun:ixheaacd_complex_fft_p2_armv7
-fun:ixheaacd_mps_complex_fft_64_armv7
-fun:ixheaacd_mps_synt_pre_twiddle_armv7
-fun:ixheaacd_mps_synt_post_twiddle_armv7
-fun:ixheaacd_calc_pre_twid_armv7
-fun:ixheaacd_calc_post_twid_armv7
-fun:ixheaacd_mps_synt_post_fft_twiddle_armv7
-fun:ixheaacd_mps_synt_out_calc_armv7
-fun:ixheaacd_fft_15_ld_armv7
-fun:ia_aac_ld_dec_rearrange_armv7
-fun:ixheaacd_imdct_using_fft_armv7
-fun:ixheaacd_fft32x32_ld2_armv7
-fun:ixheaacd_neg_expo_inc_arm
-fun:ixheaacd_inv_dit_fft_8pt_armv7
-fun:ixheaacd_scale_factor_process_armv7
-fun:ixheaacd_fix_div_dec
-fun:ixheaacd_covariance_matrix_calc_dec
-fun:ixheaacd_covariance_matrix_calc_2_dec
-fun:ixheaacd_over_lap_add1_armv8
-fun:ixheaacd_over_lap_add2_armv8
-fun:ixheaacd_decorr_filter2_dec
-fun:ixheaacd_decorr_filter1_dec
-fun:ixheaacd_divide16_pos_dec
-fun:ixheaacd_decorrelation_dec
-fun:ixheaacd_apply_rot_dec
-fun:ixheaacd_conv_ergtoamplitudelp_dec
-fun:ixheaacd_conv_ergtoamplitude_dec
-fun:ixheaacd_adjust_scale_dec
-fun:ixheaacd_expsubbandsamples_dec
-fun:ixheaacd_enery_calc_per_subband_dec
-fun:ixheaacd_harm_idx_zerotwolp_dec
-fun:ixheaacd_tns_ar_filter_fixed_armv8
-fun:ixheaacd_tns_ar_filter_dec
-fun:ixheaacd_tns_parcor_lpc_convert_dec
-fun:ixheaacd_calc_max_spectral_line_armv8
-fun:ixheaacd_post_twiddle_armv8
-fun:ixheaacd_post_twid_overlap_add_armv8
-fun:ixheaacd_neg_shift_spec_armv8
-fun:ixheaacd_spec_to_overlapbuf_dec
-fun:ixheaacd_overlap_buf_out_dec
-fun:ixheaacd_overlap_out_copy_dec
-fun:ixheaacd_pretwiddle_compute_armv8
-fun:ixheaacd_imdct_using_fft_armv8
-fun:ixheaacd_complex_fft_p2_dec
-fun:ixheaacd_mps_complex_fft_64_dec
-fun:ixheaacd_mps_synt_pre_twiddle_dec
-fun:ixheaacd_mps_synt_post_twiddle_dec
-fun:ixheaacd_calc_pre_twid_dec
-fun:ixheaacd_calc_post_twid_dec
-fun:ixheaacd_mps_synt_post_fft_twiddle_dec
-fun:ixheaacd_mps_synt_out_calc_dec
-fun:ixheaacd_fft_15_ld_dec
-fun:ixheaacd_rearrange_dec
-fun:ixheaacd_imdct_using_fft_armv8
-fun:ixheaacd_fft32x32_ld2_armv8
-fun:ixheaacd_neg_expo_inc_arm
-fun:ixheaacd_inv_dit_fft_8pt_armv8
-fun:ixheaacd_scale_factor_process_armv8
-fun:ixheaacd_aac_tns_process
-fun:ixheaacd_acelp_imdct
-fun:ixheaacd_apply_ps
-fun:ixheaacd_calc_sbrenvelope
-fun:ixheaacd_cblock_scale_spect_data
-fun:ixheaacd_complex_fft
-fun:ixheaacd_complex_fft_p3
-fun:ixheaacd_esbr_cos_sin_mod
-fun:ixheaacd_fft_480_ld
-fun:ixheaacd_filter1_lp
-fun:ixheaacd_hf_generator
-fun:ixheaacd_hybrid_analysis
-fun:ixheaacd_imdct_process
-fun:ixheaacd_inverse_transform
-fun:ixheaacd_inverse_transform_512
-fun:ixheaacd_low_pow_hf_generator
-fun:ixheaacd_mdct_480_ld
-fun:ixheaacd_mps_synt_calc
-fun:ixheaacd_read_spectral_data
-fun:ixheaacd_tns_apply
-fun:ixheaacd_cplx_synt_qmffilt
-fun:ixheaacd_sbr_qmfsyn64_winadd
-fun:ixheaacd_filt_8_ch