libavc: tidy up android bp

sort listings in alphabetical order

Test: Build

1 files changed, 181 insertions, 181 deletions

diff --git a/Android.bp b/Android.bp
index 2e11831..8e8cabe 100644
--- a/Android.bp
+++ b/Android.bp
@@ -27,10 +27,10 @@ cc_library_headers {
 cc_library_headers {
     name: "libmvcdec_headers",
     export_include_dirs: [
-        "decoder",
-        "decoder/mvc",
         "common",
         "common/mvc",
+        "decoder",
+        "decoder/mvc",
     ],
     min_sdk_version: "29",
 }
@@ -131,8 +131,8 @@ cc_defaults {
             ],
 
             local_include_dirs: [
-                "encoder/x86",
                 "common/x86",
+                "encoder/x86",
             ],
         },
 
@@ -143,8 +143,8 @@ cc_defaults {
             ],
 
             local_include_dirs: [
-                "encoder/x86",
                 "common/x86",
+                "encoder/x86",
             ],
         },
     },
@@ -182,8 +182,8 @@ cc_defaults {
     arch: {
         arm: {
             local_include_dirs: [
-                "decoder/arm",
                 "common/arm",
+                "decoder/arm",
             ],
             cflags: [
                 "-DARM",
@@ -208,8 +208,8 @@ cc_defaults {
                 "-DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC",
             ],
             local_include_dirs: [
-                "decoder/arm",
                 "common/armv8",
+                "decoder/arm",
             ],
         },
 
@@ -227,8 +227,8 @@ cc_defaults {
             ],
 
             local_include_dirs: [
-                "decoder/x86",
                 "common/x86",
+                "decoder/x86",
             ],
         },
 
@@ -240,8 +240,8 @@ cc_defaults {
             ],
 
             local_include_dirs: [
-                "decoder/x86",
                 "common/x86",
+                "decoder/x86",
             ],
         },
     },
@@ -267,114 +267,114 @@ cc_library_static {
 
     srcs: [
         "common/ih264_buf_mgr.c",
+        "common/ih264_chroma_intra_pred_filters.c",
+        "common/ih264_deblk_edge_filters.c",
         "common/ih264_disp_mgr.c",
+        "common/ih264_ihadamard_scaling.c",
         "common/ih264_inter_pred_filters.c",
+        "common/ih264_iquant_itrans_recon.c",
         "common/ih264_luma_intra_pred_filters.c",
-        "common/ih264_chroma_intra_pred_filters.c",
-        "common/ih264_padding.c",
         "common/ih264_mem_fns.c",
-        "common/ih264_deblk_edge_filters.c",
-        "common/ih264_iquant_itrans_recon.c",
-        "common/ih264_ihadamard_scaling.c",
+        "common/ih264_padding.c",
         "common/ih264_weighted_pred.c",
         "common/ithread.c",
+        "decoder/ih264d_api.c",
+        "decoder/ih264d_bitstrm.c",
         "decoder/ih264d_cabac.c",
-        "decoder/ih264d_parse_mb_header.c",
-        "decoder/ih264d_parse_cabac.c",
-        "decoder/ih264d_process_intra_mb.c",
-        "decoder/ih264d_inter_pred.c",
-        "decoder/ih264d_parse_bslice.c",
-        "decoder/ih264d_parse_pslice.c",
-        "decoder/ih264d_parse_islice.c",
         "decoder/ih264d_cabac_init_tables.c",
-        "decoder/ih264d_bitstrm.c",
         "decoder/ih264d_compute_bs.c",
         "decoder/ih264d_deblocking.c",
-        "decoder/ih264d_parse_headers.c",
+        "decoder/ih264d_dpb_mgr.c",
+        "decoder/ih264d_format_conv.c",
+        "decoder/ih264d_function_selector_generic.c",
+        "decoder/ih264d_inter_pred.c",
         "decoder/ih264d_mb_utils.c",
         "decoder/ih264d_mvpred.c",
-        "decoder/ih264d_utils.c",
+        "decoder/ih264d_nal.c",
+        "decoder/ih264d_parse_bslice.c",
+        "decoder/ih264d_parse_cabac.c",
+        "decoder/ih264d_parse_cavlc.c",
+        "decoder/ih264d_parse_headers.c",
+        "decoder/ih264d_parse_islice.c",
+        "decoder/ih264d_parse_mb_header.c",
+        "decoder/ih264d_parse_pslice.c",
+        "decoder/ih264d_parse_slice.c",
         "decoder/ih264d_process_bslice.c",
+        "decoder/ih264d_process_intra_mb.c",
         "decoder/ih264d_process_pslice.c",
-        "decoder/ih264d_parse_slice.c",
         "decoder/ih264d_quant_scaling.c",
-        "decoder/ih264d_parse_cavlc.c",
-        "decoder/ih264d_dpb_mgr.c",
-        "decoder/ih264d_nal.c",
         "decoder/ih264d_sei.c",
         "decoder/ih264d_tables.c",
-        "decoder/ih264d_vui.c",
-        "decoder/ih264d_format_conv.c",
-        "decoder/ih264d_thread_parse_decode.c",
-        "decoder/ih264d_api.c",
         "decoder/ih264d_thread_compute_bs.c",
-        "decoder/ih264d_function_selector_generic.c",
+        "decoder/ih264d_thread_parse_decode.c",
+        "decoder/ih264d_utils.c",
+        "decoder/ih264d_vui.c",
     ],
 
     arch: {
         arm: {
             srcs: [
-                "decoder/arm/ih264d_function_selector.c",
                 "common/arm/ih264_arm_memory_barrier.s",
+                "decoder/arm/ih264d_function_selector.c",
             ],
 
             neon: {
                 srcs: [
-                    "decoder/arm/ih264d_function_selector_a9q.c",
-                    "common/arm/ih264_intra_pred_chroma_a9q.s",
-                    "common/arm/ih264_intra_pred_luma_16x16_a9q.s",
-                    "common/arm/ih264_intra_pred_luma_4x4_a9q.s",
-                    "common/arm/ih264_intra_pred_luma_8x8_a9q.s",
+                    "common/arm/ih264_deblk_chroma_a9.s",
+                    "common/arm/ih264_deblk_luma_a9.s",
+                    "common/arm/ih264_default_weighted_pred_a9q.s",
+                    "common/arm/ih264_ihadamard_scaling_a9.s",
                     "common/arm/ih264_inter_pred_chroma_a9q.s",
                     "common/arm/ih264_inter_pred_filters_luma_horz_a9q.s",
                     "common/arm/ih264_inter_pred_filters_luma_vert_a9q.s",
                     "common/arm/ih264_inter_pred_luma_copy_a9q.s",
-                    "common/arm/ih264_inter_pred_luma_horz_qpel_a9q.s",
-                    "common/arm/ih264_inter_pred_luma_vert_qpel_a9q.s",
                     "common/arm/ih264_inter_pred_luma_horz_hpel_vert_hpel_a9q.s",
-                    "common/arm/ih264_inter_pred_luma_horz_qpel_vert_qpel_a9q.s",
-                    "common/arm/ih264_inter_pred_luma_horz_qpel_vert_hpel_a9q.s",
                     "common/arm/ih264_inter_pred_luma_horz_hpel_vert_qpel_a9q.s",
-                    "common/arm/ih264_default_weighted_pred_a9q.s",
-                    "common/arm/ih264_weighted_pred_a9q.s",
-                    "common/arm/ih264_weighted_bi_pred_a9q.s",
-                    "common/arm/ih264_deblk_chroma_a9.s",
-                    "common/arm/ih264_deblk_luma_a9.s",
-                    "common/arm/ih264_padding_neon.s",
+                    "common/arm/ih264_inter_pred_luma_horz_qpel_a9q.s",
+                    "common/arm/ih264_inter_pred_luma_horz_qpel_vert_hpel_a9q.s",
+                    "common/arm/ih264_inter_pred_luma_horz_qpel_vert_qpel_a9q.s",
+                    "common/arm/ih264_inter_pred_luma_vert_qpel_a9q.s",
+                    "common/arm/ih264_intra_pred_chroma_a9q.s",
+                    "common/arm/ih264_intra_pred_luma_16x16_a9q.s",
+                    "common/arm/ih264_intra_pred_luma_4x4_a9q.s",
+                    "common/arm/ih264_intra_pred_luma_8x8_a9q.s",
                     "common/arm/ih264_iquant_itrans_recon_a9.s",
                     "common/arm/ih264_iquant_itrans_recon_dc_a9.s",
-                    "common/arm/ih264_ihadamard_scaling_a9.s",
+                    "common/arm/ih264_padding_neon.s",
+                    "common/arm/ih264_weighted_bi_pred_a9q.s",
+                    "common/arm/ih264_weighted_pred_a9q.s",
+                    "decoder/arm/ih264d_function_selector_a9q.c",
                 ],
             },
         },
 
         arm64: {
             srcs: [
-                "decoder/arm/ih264d_function_selector.c",
-                "decoder/arm/ih264d_function_selector_av8.c",
-                "common/armv8/ih264_intra_pred_chroma_av8.s",
-                "common/armv8/ih264_intra_pred_luma_16x16_av8.s",
-                "common/armv8/ih264_intra_pred_luma_4x4_av8.s",
+                "common/armv8/ih264_deblk_chroma_av8.s",
+                "common/armv8/ih264_deblk_luma_av8.s",
+                "common/armv8/ih264_default_weighted_pred_av8.s",
+                "common/armv8/ih264_ihadamard_scaling_av8.s",
                 "common/armv8/ih264_inter_pred_chroma_av8.s",
                 "common/armv8/ih264_inter_pred_filters_luma_horz_av8.s",
                 "common/armv8/ih264_inter_pred_filters_luma_vert_av8.s",
                 "common/armv8/ih264_inter_pred_luma_copy_av8.s",
-                "common/armv8/ih264_inter_pred_luma_horz_qpel_av8.s",
-                "common/armv8/ih264_inter_pred_luma_vert_qpel_av8.s",
                 "common/armv8/ih264_inter_pred_luma_horz_hpel_vert_hpel_av8.s",
-                "common/armv8/ih264_inter_pred_luma_horz_qpel_vert_qpel_av8.s",
-                "common/armv8/ih264_inter_pred_luma_horz_qpel_vert_hpel_av8.s",
                 "common/armv8/ih264_inter_pred_luma_horz_hpel_vert_qpel_av8.s",
-                "common/armv8/ih264_default_weighted_pred_av8.s",
-                "common/armv8/ih264_weighted_pred_av8.s",
-                "common/armv8/ih264_weighted_bi_pred_av8.s",
-                "common/armv8/ih264_deblk_chroma_av8.s",
-                "common/armv8/ih264_deblk_luma_av8.s",
-                "common/armv8/ih264_padding_neon_av8.s",
+                "common/armv8/ih264_inter_pred_luma_horz_qpel_av8.s",
+                "common/armv8/ih264_inter_pred_luma_horz_qpel_vert_hpel_av8.s",
+                "common/armv8/ih264_inter_pred_luma_horz_qpel_vert_qpel_av8.s",
+                "common/armv8/ih264_inter_pred_luma_vert_qpel_av8.s",
+                "common/armv8/ih264_intra_pred_chroma_av8.s",
+                "common/armv8/ih264_intra_pred_luma_16x16_av8.s",
+                "common/armv8/ih264_intra_pred_luma_4x4_av8.s",
+                "common/armv8/ih264_intra_pred_luma_8x8_av8.s",
                 "common/armv8/ih264_iquant_itrans_recon_av8.s",
                 "common/armv8/ih264_iquant_itrans_recon_dc_av8.s",
-                "common/armv8/ih264_ihadamard_scaling_av8.s",
-                "common/armv8/ih264_intra_pred_luma_8x8_av8.s",
+                "common/armv8/ih264_padding_neon_av8.s",
+                "common/armv8/ih264_weighted_bi_pred_av8.s",
+                "common/armv8/ih264_weighted_pred_av8.s",
+                "decoder/arm/ih264d_function_selector_av8.c",
+                "decoder/arm/ih264d_function_selector.c",
             ],
         },
 
@@ -389,41 +389,41 @@ cc_library_static {
 
         x86: {
             srcs: [
-                "decoder/x86/ih264d_function_selector.c",
-                "decoder/x86/ih264d_function_selector_sse42.c",
-                "decoder/x86/ih264d_function_selector_ssse3.c",
-                "common/x86/ih264_inter_pred_filters_ssse3.c",
-                "common/x86/ih264_deblk_luma_ssse3.c",
+                "common/x86/ih264_chroma_intra_pred_filters_ssse3.c",
                 "common/x86/ih264_deblk_chroma_ssse3.c",
-                "common/x86/ih264_padding_ssse3.c",
-                "common/x86/ih264_mem_fns_ssse3.c",
+                "common/x86/ih264_deblk_luma_ssse3.c",
+                "common/x86/ih264_ihadamard_scaling_sse42.c",
+                "common/x86/ih264_inter_pred_filters_ssse3.c",
                 "common/x86/ih264_iquant_itrans_recon_dc_ssse3.c",
+                "common/x86/ih264_iquant_itrans_recon_sse42.c",
                 "common/x86/ih264_iquant_itrans_recon_ssse3.c",
                 "common/x86/ih264_luma_intra_pred_filters_ssse3.c",
-                "common/x86/ih264_chroma_intra_pred_filters_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_sse42.c",
+                "common/x86/ih264_mem_fns_ssse3.c",
+                "common/x86/ih264_padding_ssse3.c",
                 "common/x86/ih264_weighted_pred_sse42.c",
-                "common/x86/ih264_ihadamard_scaling_sse42.c",
+                "decoder/x86/ih264d_function_selector_sse42.c",
+                "decoder/x86/ih264d_function_selector_ssse3.c",
+                "decoder/x86/ih264d_function_selector.c",
             ],
         },
 
         x86_64: {
             srcs: [
-                "decoder/x86/ih264d_function_selector.c",
-                "decoder/x86/ih264d_function_selector_sse42.c",
-                "decoder/x86/ih264d_function_selector_ssse3.c",
-                "common/x86/ih264_inter_pred_filters_ssse3.c",
-                "common/x86/ih264_deblk_luma_ssse3.c",
+                "common/x86/ih264_chroma_intra_pred_filters_ssse3.c",
                 "common/x86/ih264_deblk_chroma_ssse3.c",
-                "common/x86/ih264_padding_ssse3.c",
-                "common/x86/ih264_mem_fns_ssse3.c",
+                "common/x86/ih264_deblk_luma_ssse3.c",
+                "common/x86/ih264_ihadamard_scaling_sse42.c",
+                "common/x86/ih264_inter_pred_filters_ssse3.c",
                 "common/x86/ih264_iquant_itrans_recon_dc_ssse3.c",
+                "common/x86/ih264_iquant_itrans_recon_sse42.c",
                 "common/x86/ih264_iquant_itrans_recon_ssse3.c",
                 "common/x86/ih264_luma_intra_pred_filters_ssse3.c",
-                "common/x86/ih264_chroma_intra_pred_filters_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_sse42.c",
+                "common/x86/ih264_mem_fns_ssse3.c",
+                "common/x86/ih264_padding_ssse3.c",
                 "common/x86/ih264_weighted_pred_sse42.c",
-                "common/x86/ih264_ihadamard_scaling_sse42.c",
+                "decoder/x86/ih264d_function_selector_sse42.c",
+                "decoder/x86/ih264d_function_selector_ssse3.c",
+                "decoder/x86/ih264d_function_selector.c",
             ],
         },
     },
@@ -453,13 +453,13 @@ cc_library_static {
     ],
 
     srcs: [
-        "decoder/mvc/imvcd_api.c",
         "decoder/mvc/imvcd_api_utils.c",
         "decoder/mvc/imvcd_dpb_manager.c",
         "decoder/mvc/imvcd_error_handler.c",
         "decoder/mvc/imvcd_nalu_parser.c",
         "decoder/mvc/imvcd_slice_functions.c",
         "decoder/mvc/imvcd_utils.c",
+        "decoder/mvc/imvcd_api.c",
     ],
 }
 
@@ -473,49 +473,51 @@ cc_library_static {
     ],
 
     srcs: [ //Rate Control
-        "common/ih264_resi_trans_quant.c",
-        "common/ih264_iquant_itrans_recon.c",
-        "common/ih264_ihadamard_scaling.c",
-        "common/ih264_inter_pred_filters.c",
-        "common/ih264_luma_intra_pred_filters.c",
+        "common/ih264_buf_mgr.c",
+        "common/ih264_cabac_tables.c",
+        "common/ih264_cavlc_tables.c",
         "common/ih264_chroma_intra_pred_filters.c",
-        "common/ih264_padding.c",
-        "common/ih264_mem_fns.c",
+        "common/ih264_common_tables.c",
         "common/ih264_deblk_edge_filters.c",
         "common/ih264_deblk_tables.c",
-        "common/ih264_cavlc_tables.c",
-        "common/ih264_cabac_tables.c",
-        "common/ih264_common_tables.c",
-        "common/ih264_trans_data.c",
-        "common/ih264_buf_mgr.c",
         "common/ih264_dpb_mgr.c",
+        "common/ih264_ihadamard_scaling.c",
+        "common/ih264_inter_pred_filters.c",
+        "common/ih264_iquant_itrans_recon.c",
         "common/ih264_list.c",
+        "common/ih264_luma_intra_pred_filters.c",
+        "common/ih264_mem_fns.c",
+        "common/ih264_padding.c",
+        "common/ih264_resi_trans_quant.c",
+        "common/ih264_trans_data.c",
         "common/ithread.c",
+        "encoder/ih264e_api.c",
+        "encoder/ih264e_bitstream.c",
+        "encoder/ih264e_cabac.c",
+        "encoder/ih264e_cabac_encode.c",
+        "encoder/ih264e_cabac_init.c",
+        "encoder/ih264e_cavlc.c",
+        "encoder/ih264e_core_coding.c",
+        "encoder/ih264e_deblk.c",
+        "encoder/ih264e_encode.c",
+        "encoder/ih264e_encode_header.c",
+        "encoder/ih264e_fmt_conv.c",
+        "encoder/ih264e_function_selector_generic.c",
         "encoder/ih264e_globals.c",
-        "encoder/ih264e_intra_modes_eval.c",
         "encoder/ih264e_half_pel.c",
+        "encoder/ih264e_intra_modes_eval.c",
         "encoder/ih264e_mc.c",
         "encoder/ih264e_me.c",
-        "encoder/ih264e_rc_mem_interface.c",
-        "encoder/ih264e_time_stamp.c",
         "encoder/ih264e_modify_frm_rate.c",
-        "encoder/ih264e_rate_control.c",
-        "encoder/ih264e_core_coding.c",
-        "encoder/ih264e_deblk.c",
-        "encoder/ih264e_api.c",
         "encoder/ih264e_process.c",
-        "encoder/ih264e_encode.c",
+        "encoder/ih264e_rate_control.c",
+        "encoder/ih264e_rc_mem_interface.c",
+        "encoder/ih264e_sei.c",
+        "encoder/ih264e_time_stamp.c",
         "encoder/ih264e_utils.c",
         "encoder/ih264e_version.c",
-        "encoder/ih264e_bitstream.c",
-        "encoder/ih264e_cavlc.c",
-        "encoder/ih264e_cabac_init.c",
-        "encoder/ih264e_cabac.c",
-        "encoder/ih264e_cabac_encode.c",
-        "encoder/ih264e_encode_header.c",
-        "encoder/ih264e_function_selector_generic.c",
-        "encoder/ih264e_fmt_conv.c",
-        "encoder/irc_rate_control_api.c",
+        "encoder/ime.c",
+        "encoder/ime_distortion_metrics.c",
         "encoder/irc_bit_allocation.c",
         "encoder/irc_cbr_buffer_control.c",
         "encoder/irc_est_sad.c",
@@ -523,47 +525,45 @@ cc_library_static {
         "encoder/irc_frame_info_collector.c",
         "encoder/irc_mb_model_based.c",
         "encoder/irc_picture_type.c",
+        "encoder/irc_rate_control_api.c",
         "encoder/irc_rd_model.c",
         "encoder/irc_vbr_storage_vbv.c",
         "encoder/irc_vbr_str_prms.c",
-        "encoder/ime.c",
-        "encoder/ime_distortion_metrics.c",
-        "encoder/ih264e_sei.c",
         "encoder/psnr.c",
     ],
 
     arch: {
         arm: {
             srcs: [
-                "encoder/arm/ih264e_function_selector.c",
                 "common/arm/ih264_arm_memory_barrier.s",
+                "encoder/arm/ih264e_function_selector.c",
             ],
 
             neon: {
                 srcs: [
-                    "encoder/arm/ih264e_function_selector_a9q.c",
-                    "common/arm/ih264_resi_trans_quant_a9.s",
-                    "common/arm/ih264_iquant_itrans_recon_a9.s",
-                    "common/arm/ih264_iquant_itrans_recon_dc_a9.s",
-                    "common/arm/ih264_ihadamard_scaling_a9.s",
                     "common/arm/ih264_deblk_chroma_a9.s",
                     "common/arm/ih264_deblk_luma_a9.s",
-                    "common/arm/ih264_intra_pred_chroma_a9q.s",
-                    "common/arm/ih264_intra_pred_luma_16x16_a9q.s",
-                    "common/arm/ih264_intra_pred_luma_4x4_a9q.s",
-                    "common/arm/ih264_intra_pred_luma_8x8_a9q.s",
+                    "common/arm/ih264_ihadamard_scaling_a9.s",
                     "common/arm/ih264_inter_pred_chroma_a9q.s",
                     "common/arm/ih264_inter_pred_filters_luma_horz_a9q.s",
                     "common/arm/ih264_inter_pred_filters_luma_vert_a9q.s",
                     "common/arm/ih264_inter_pred_luma_bilinear_a9q.s",
                     "common/arm/ih264_inter_pred_luma_copy_a9q.s",
-                    "common/arm/ih264_padding_neon.s",
+                    "common/arm/ih264_intra_pred_chroma_a9q.s",
+                    "common/arm/ih264_intra_pred_luma_16x16_a9q.s",
+                    "common/arm/ih264_intra_pred_luma_4x4_a9q.s",
+                    "common/arm/ih264_intra_pred_luma_8x8_a9q.s",
+                    "common/arm/ih264_iquant_itrans_recon_a9.s",
+                    "common/arm/ih264_iquant_itrans_recon_dc_a9.s",
                     "common/arm/ih264_mem_fns_neon.s",
+                    "common/arm/ih264_padding_neon.s",
+                    "common/arm/ih264_resi_trans_quant_a9.s",
                     "encoder/arm/ih264e_evaluate_intra16x16_modes_a9q.s",
                     "encoder/arm/ih264e_evaluate_intra4x4_modes_a9q.s",
                     "encoder/arm/ih264e_evaluate_intra_chroma_modes_a9q.s",
-                    "encoder/arm/ih264e_half_pel.s",
                     "encoder/arm/ih264e_fmt_conv.s",
+                    "encoder/arm/ih264e_function_selector_a9q.c",
+                    "encoder/arm/ih264e_half_pel.s",
                     "encoder/arm/ime_distortion_metrics_a9q.s",
                 ],
             },
@@ -571,24 +571,24 @@ cc_library_static {
 
         arm64: {
             srcs: [
-                "encoder/arm/ih264e_function_selector.c",
-                "encoder/arm/ih264e_function_selector_av8.c",
-                "common/armv8/ih264_resi_trans_quant_av8.s",
-                "common/armv8/ih264_iquant_itrans_recon_av8.s",
-                "common/armv8/ih264_iquant_itrans_recon_dc_av8.s",
+                "common/armv8/ih264_deblk_chroma_av8.s",
+                "common/armv8/ih264_deblk_luma_av8.s",
                 "common/armv8/ih264_ihadamard_scaling_av8.s",
+                "common/armv8/ih264_inter_pred_chroma_av8.s",
+                "common/armv8/ih264_inter_pred_filters_luma_horz_av8.s",
+                "common/armv8/ih264_inter_pred_filters_luma_vert_av8.s",
+                "common/armv8/ih264_inter_pred_luma_copy_av8.s",
                 "common/armv8/ih264_intra_pred_chroma_av8.s",
                 "common/armv8/ih264_intra_pred_luma_16x16_av8.s",
                 "common/armv8/ih264_intra_pred_luma_4x4_av8.s",
                 "common/armv8/ih264_intra_pred_luma_8x8_av8.s",
-                "common/armv8/ih264_inter_pred_luma_copy_av8.s",
-                "common/armv8/ih264_inter_pred_chroma_av8.s",
-                "common/armv8/ih264_inter_pred_filters_luma_horz_av8.s",
-                "common/armv8/ih264_inter_pred_filters_luma_vert_av8.s",
-                "common/armv8/ih264_padding_neon_av8.s",
+                "common/armv8/ih264_iquant_itrans_recon_av8.s",
+                "common/armv8/ih264_iquant_itrans_recon_dc_av8.s",
                 "common/armv8/ih264_mem_fns_neon_av8.s",
-                "common/armv8/ih264_deblk_luma_av8.s",
-                "common/armv8/ih264_deblk_chroma_av8.s",
+                "common/armv8/ih264_padding_neon_av8.s",
+                "common/armv8/ih264_resi_trans_quant_av8.s",
+                "encoder/arm/ih264e_function_selector.c",
+                "encoder/arm/ih264e_function_selector_av8.c",
                 "encoder/armv8/ih264e_evaluate_intra16x16_modes_av8.s",
                 "encoder/armv8/ih264e_evaluate_intra_chroma_modes_av8.s",
                 "encoder/armv8/ih264e_half_pel_av8.s",
@@ -604,23 +604,23 @@ cc_library_static {
 
         x86: {
             srcs: [
-                "encoder/x86/ih264e_function_selector.c",
-                "encoder/x86/ih264e_function_selector_sse42.c",
-                "encoder/x86/ih264e_function_selector_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_dc_ssse3.c",
-                "common/x86/ih264_ihadamard_scaling_ssse3.c",
-                "common/x86/ih264_inter_pred_filters_ssse3.c",
-                "common/x86/ih264_mem_fns_ssse3.c",
-                "common/x86/ih264_padding_ssse3.c",
-                "common/x86/ih264_luma_intra_pred_filters_ssse3.c",
                 "common/x86/ih264_chroma_intra_pred_filters_ssse3.c",
                 "common/x86/ih264_deblk_chroma_ssse3.c",
                 "common/x86/ih264_deblk_luma_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_sse42.c",
                 "common/x86/ih264_ihadamard_scaling_sse42.c",
+                "common/x86/ih264_ihadamard_scaling_ssse3.c",
+                "common/x86/ih264_inter_pred_filters_ssse3.c",
+                "common/x86/ih264_iquant_itrans_recon_dc_ssse3.c",
+                "common/x86/ih264_iquant_itrans_recon_sse42.c",
+                "common/x86/ih264_iquant_itrans_recon_ssse3.c",
+                "common/x86/ih264_luma_intra_pred_filters_ssse3.c",
+                "common/x86/ih264_mem_fns_ssse3.c",
+                "common/x86/ih264_padding_ssse3.c",
                 "common/x86/ih264_resi_trans_quant_sse42.c",
                 "common/x86/ih264_weighted_pred_sse42.c",
+                "encoder/x86/ih264e_function_selector.c",
+                "encoder/x86/ih264e_function_selector_sse42.c",
+                "encoder/x86/ih264e_function_selector_ssse3.c",
                 "encoder/x86/ih264e_half_pel_ssse3.c",
                 "encoder/x86/ih264e_intra_modes_eval_ssse3.c",
                 "encoder/x86/ime_distortion_metrics_sse42.c",
@@ -629,23 +629,23 @@ cc_library_static {
 
         x86_64: {
             srcs: [
-                "encoder/x86/ih264e_function_selector.c",
-                "encoder/x86/ih264e_function_selector_sse42.c",
-                "encoder/x86/ih264e_function_selector_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_dc_ssse3.c",
-                "common/x86/ih264_ihadamard_scaling_ssse3.c",
-                "common/x86/ih264_inter_pred_filters_ssse3.c",
-                "common/x86/ih264_mem_fns_ssse3.c",
-                "common/x86/ih264_padding_ssse3.c",
-                "common/x86/ih264_luma_intra_pred_filters_ssse3.c",
                 "common/x86/ih264_chroma_intra_pred_filters_ssse3.c",
                 "common/x86/ih264_deblk_chroma_ssse3.c",
                 "common/x86/ih264_deblk_luma_ssse3.c",
-                "common/x86/ih264_iquant_itrans_recon_sse42.c",
                 "common/x86/ih264_ihadamard_scaling_sse42.c",
+                "common/x86/ih264_ihadamard_scaling_ssse3.c",
+                "common/x86/ih264_inter_pred_filters_ssse3.c",
+                "common/x86/ih264_iquant_itrans_recon_dc_ssse3.c",
+                "common/x86/ih264_iquant_itrans_recon_sse42.c",
+                "common/x86/ih264_iquant_itrans_recon_ssse3.c",
+                "common/x86/ih264_luma_intra_pred_filters_ssse3.c",
+                "common/x86/ih264_mem_fns_ssse3.c",
+                "common/x86/ih264_padding_ssse3.c",
                 "common/x86/ih264_resi_trans_quant_sse42.c",
                 "common/x86/ih264_weighted_pred_sse42.c",
+                "encoder/x86/ih264e_function_selector.c",
+                "encoder/x86/ih264e_function_selector_sse42.c",
+                "encoder/x86/ih264e_function_selector_ssse3.c",
                 "encoder/x86/ih264e_half_pel_ssse3.c",
                 "encoder/x86/ih264e_intra_modes_eval_ssse3.c",
                 "encoder/x86/ime_distortion_metrics_sse42.c",
@@ -724,12 +724,12 @@ cc_library_static {
 
             neon: {
                 srcs: [
-                    "encoder/arm/svc/isvce_function_selector_a9q.c",
                     "common/arm/svc/isvc_intra_sampling_neon.c",
                     "common/arm/svc/isvc_iquant_itrans_recon_neon.c",
                     "common/arm/svc/isvc_mem_fns_neon.c",
                     "common/arm/svc/isvc_resi_trans_quant_neon.c",
                     "encoder/arm/svc/isvce_downscaler_neon.c",
+                    "encoder/arm/svc/isvce_function_selector_a9q.c",
                     "encoder/arm/svc/isvce_rc_utils_neon.c",
                     "encoder/arm/svc/isvce_residual_pred_neon.c",
                 ],
@@ -738,18 +738,18 @@ cc_library_static {
 
         arm64: {
             local_include_dirs: [
-                "common/arm/svc",
                 "encoder/arm/svc",
+                "common/arm/svc",
             ],
 
             srcs: [
-                "encoder/arm/svc/isvce_function_selector.c",
-                "encoder/arm/svc/isvce_function_selector_av8.c",
                 "common/arm/svc/isvc_intra_sampling_neon.c",
                 "common/arm/svc/isvc_iquant_itrans_recon_neon.c",
                 "common/arm/svc/isvc_mem_fns_neon.c",
                 "common/arm/svc/isvc_resi_trans_quant_neon.c",
                 "encoder/arm/svc/isvce_downscaler_neon.c",
+                "encoder/arm/svc/isvce_function_selector.c",
+                "encoder/arm/svc/isvce_function_selector_av8.c",
                 "encoder/arm/svc/isvce_rc_utils_neon.c",
                 "encoder/arm/svc/isvce_residual_pred_neon.c",
             ],
@@ -767,8 +767,8 @@ cc_library_static {
 
         x86: {
             local_include_dirs: [
-                "encoder/x86/svc",
                 "common/x86/svc",
+                "encoder/x86/svc",
             ],
 
             srcs: [
@@ -791,8 +791,8 @@ cc_library_static {
 
         x86_64: {
             local_include_dirs: [
-                "encoder/x86/svc",
                 "common/x86/svc",
+                "encoder/x86/svc",
             ],
 
             srcs: [
@@ -823,27 +823,25 @@ cc_library_static {
     ],
 
     export_include_dirs: [
-        "decoder",
-        "decoder/svc",
         "common",
         "common/svc",
+        "decoder",
+        "decoder/svc",
     ],
 
     srcs: [
-        "decoder/svc/isvcd_ii_pred.c",
-        "decoder/svc/isvcd_intra_resamp.c",
-        "decoder/svc/isvcd_iquant_itrans.c",
-        "decoder/svc/isvcd_iquant_itrans_residual.c",
-        "decoder/svc/isvcd_iquant_itrans_residual_recon.c",
-        "decoder/svc/isvcd_mode_mv_resamp.c",
-        "decoder/svc/isvcd_pred_residual_recon.c",
-        "decoder/svc/isvcd_residual_resamp.c",
         "decoder/svc/isvcd_api.c",
         "decoder/svc/isvcd_cabac.c",
         "decoder/svc/isvcd_cabac_init_tables.c",
         "decoder/svc/isvcd_compute_bs.c",
         "decoder/svc/isvcd_function_selector_generic.c",
+        "decoder/svc/isvcd_ii_pred.c",
+        "decoder/svc/isvcd_intra_resamp.c",
+        "decoder/svc/isvcd_iquant_itrans.c",
+        "decoder/svc/isvcd_iquant_itrans_residual.c",
+        "decoder/svc/isvcd_iquant_itrans_residual_recon.c",
         "decoder/svc/isvcd_mb_utils.c",
+        "decoder/svc/isvcd_mode_mv_resamp.c",
         "decoder/svc/isvcd_nal.c",
         "decoder/svc/isvcd_nal_parse.c",
         "decoder/svc/isvcd_parse_cavlc.c",
@@ -852,8 +850,10 @@ cc_library_static {
         "decoder/svc/isvcd_parse_epslice.c",
         "decoder/svc/isvcd_parse_headers.c",
         "decoder/svc/isvcd_parse_slice.c",
+        "decoder/svc/isvcd_pred_residual_recon.c",
         "decoder/svc/isvcd_process_ebslice.c",
         "decoder/svc/isvcd_process_epslice.c",
+        "decoder/svc/isvcd_residual_resamp.c",
         "decoder/svc/isvcd_thread_compute_bs.c",
         "decoder/svc/isvcd_thread_parse_decode.c",
         "decoder/svc/isvcd_utils.c",