diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..3389259
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,385 @@
+cc_library_static {
+    name: "libhevcdec",
+
+    cflags: [
+        "-D_LIB",
+        "-DMULTICORE",
+        "-fPIC",
+
+        "-O3",
+        "-DANDROID",
+    ],
+
+    export_include_dirs: [
+        "decoder",
+        "common",
+    ],
+
+    srcs: [
+        "common/ihevc_quant_tables.c",
+        "common/ihevc_inter_pred_filters.c",
+        "common/ihevc_weighted_pred.c",
+        "common/ihevc_padding.c",
+        "common/ihevc_deblk_edge_filter.c",
+        "common/ihevc_deblk_tables.c",
+        "common/ihevc_cabac_tables.c",
+        "common/ihevc_common_tables.c",
+        "common/ihevc_intra_pred_filters.c",
+        "common/ihevc_chroma_intra_pred_filters.c",
+        "common/ihevc_mem_fns.c",
+        "common/ihevc_sao.c",
+        "common/ihevc_trans_tables.c",
+        "common/ihevc_recon.c",
+        "common/ihevc_itrans.c",
+        "common/ihevc_itrans_recon.c",
+        "common/ihevc_iquant_recon.c",
+        "common/ihevc_iquant_itrans_recon.c",
+        "common/ihevc_itrans_recon_32x32.c",
+        "common/ihevc_itrans_recon_16x16.c",
+        "common/ihevc_itrans_recon_8x8.c",
+        "common/ihevc_chroma_itrans_recon.c",
+        "common/ihevc_chroma_iquant_recon.c",
+        "common/ihevc_chroma_iquant_itrans_recon.c",
+        "common/ihevc_chroma_recon.c",
+        "common/ihevc_chroma_itrans_recon_16x16.c",
+        "common/ihevc_chroma_itrans_recon_8x8.c",
+        "common/ihevc_buf_mgr.c",
+        "common/ihevc_disp_mgr.c",
+        "common/ihevc_dpb_mgr.c",
+        "common/ithread.c",
+        "decoder/ihevcd_version.c",
+        "decoder/ihevcd_api.c",
+        "decoder/ihevcd_decode.c",
+        "decoder/ihevcd_nal.c",
+        "decoder/ihevcd_bitstream.c",
+        "decoder/ihevcd_parse_headers.c",
+        "decoder/ihevcd_parse_slice_header.c",
+        "decoder/ihevcd_parse_slice.c",
+        "decoder/ihevcd_parse_residual.c",
+        "decoder/ihevcd_cabac.c",
+        "decoder/ihevcd_intra_pred_mode_prediction.c",
+        "decoder/ihevcd_process_slice.c",
+        "decoder/ihevcd_utils.c",
+        "decoder/ihevcd_job_queue.c",
+        "decoder/ihevcd_ref_list.c",
+        "decoder/ihevcd_get_mv.c",
+        "decoder/ihevcd_mv_pred.c",
+        "decoder/ihevcd_mv_merge.c",
+        "decoder/ihevcd_iquant_itrans_recon_ctb.c",
+        "decoder/ihevcd_itrans_recon_dc.c",
+        "decoder/ihevcd_common_tables.c",
+        "decoder/ihevcd_boundary_strength.c",
+        "decoder/ihevcd_deblk.c",
+        "decoder/ihevcd_inter_pred.c",
+        "decoder/ihevcd_sao.c",
+        "decoder/ihevcd_ilf_padding.c",
+        "decoder/ihevcd_fmt_conv.c",
+    ],
+
+    arch: {
+        arm64: {
+            cflags: [
+                "-DARMV8",
+                "-DDISABLE_NEONINTR",
+                "-DARM",
+                "-DARMGCC",
+
+                "-DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC",
+            ],
+            local_include_dirs: [
+                "decoder/arm",
+                "common/arm",
+                "decoder/arm64",
+                "common/arm64",
+            ],
+
+            srcs: [
+                "decoder/arm/ihevcd_function_selector.c",
+                "decoder/arm/ihevcd_function_selector_noneon.c",
+                "decoder/arm64/ihevcd_function_selector_av8.c",
+                "common/arm/ihevc_intra_pred_filters_neon_intr.c",
+                "common/arm/ihevc_weighted_pred_neon_intr.c",
+                "common/arm64/ihevc_mem_fns.s",
+                "common/arm64/ihevc_itrans_recon_32x32.s",
+                "common/arm64/ihevc_weighted_pred_bi_default.s",
+                "common/arm64/ihevc_weighted_pred_bi.s",
+                "common/arm64/ihevc_weighted_pred_uni.s",
+                "common/arm64/ihevc_deblk_luma_horz.s",
+                "common/arm64/ihevc_deblk_luma_vert.s",
+                "common/arm64/ihevc_deblk_chroma_vert.s",
+                "common/arm64/ihevc_deblk_chroma_horz.s",
+                "common/arm64/ihevc_sao_band_offset_luma.s",
+                "common/arm64/ihevc_sao_band_offset_chroma.s",
+                "common/arm64/ihevc_sao_edge_offset_class0.s",
+                "common/arm64/ihevc_sao_edge_offset_class0_chroma.s",
+                "common/arm64/ihevc_sao_edge_offset_class1.s",
+                "common/arm64/ihevc_sao_edge_offset_class1_chroma.s",
+                "common/arm64/ihevc_sao_edge_offset_class2.s",
+                "common/arm64/ihevc_sao_edge_offset_class2_chroma.s",
+                "common/arm64/ihevc_sao_edge_offset_class3.s",
+                "common/arm64/ihevc_sao_edge_offset_class3_chroma.s",
+                "common/arm64/ihevc_inter_pred_luma_horz_w16out.s",
+                "common/arm64/ihevc_inter_pred_filters_luma_horz.s",
+                "common/arm64/ihevc_inter_pred_filters_luma_vert.s",
+                "common/arm64/ihevc_inter_pred_chroma_horz.s",
+                "common/arm64/ihevc_inter_pred_chroma_horz_w16out.s",
+                "common/arm64/ihevc_inter_pred_chroma_vert.s",
+                "common/arm64/ihevc_inter_pred_chroma_vert_w16out.s",
+                "common/arm64/ihevc_inter_pred_chroma_vert_w16inp.s",
+                "common/arm64/ihevc_inter_pred_chroma_vert_w16inp_w16out.s",
+                "common/arm64/ihevc_inter_pred_filters_luma_vert_w16inp.s",
+                "common/arm64/ihevc_inter_pred_filters_luma_vert_w16out.s",
+                "common/arm64/ihevc_inter_pred_luma_vert_w16inp_w16out.s",
+                "common/arm64/ihevc_inter_pred_luma_copy_w16out.s",
+                "common/arm64/ihevc_inter_pred_luma_copy.s",
+                "common/arm64/ihevc_inter_pred_chroma_copy.s",
+                "common/arm64/ihevc_inter_pred_chroma_copy_w16out.s",
+                "common/arm64/ihevc_itrans_recon_4x4_ttype1.s",
+                "common/arm64/ihevc_itrans_recon_4x4.s",
+                "common/arm64/ihevc_itrans_recon_8x8.s",
+                "common/arm64/ihevc_itrans_recon_16x16.s",
+                "common/arm64/ihevc_intra_pred_chroma_planar.s",
+                "common/arm64/ihevc_intra_pred_chroma_dc.s",
+                "common/arm64/ihevc_intra_pred_chroma_horz.s",
+                "common/arm64/ihevc_intra_pred_chroma_ver.s",
+                "common/arm64/ihevc_intra_pred_chroma_mode2.s",
+                "common/arm64/ihevc_intra_pred_chroma_mode_18_34.s",
+                "common/arm64/ihevc_intra_pred_filters_chroma_mode_11_to_17.s",
+                "common/arm64/ihevc_intra_pred_filters_chroma_mode_19_to_25.s",
+                "common/arm64/ihevc_intra_pred_chroma_mode_3_to_9.s",
+                "common/arm64/ihevc_intra_pred_chroma_mode_27_to_33.s",
+                "common/arm64/ihevc_intra_pred_luma_planar.s",
+                "common/arm64/ihevc_intra_pred_luma_horz.s",
+                "common/arm64/ihevc_intra_pred_luma_mode2.s",
+                "common/arm64/ihevc_intra_pred_luma_mode_27_to_33.s",
+                "common/arm64/ihevc_intra_pred_luma_mode_18_34.s",
+                "common/arm64/ihevc_intra_pred_luma_vert.s",
+                "common/arm64/ihevc_intra_pred_luma_dc.s",
+                "common/arm64/ihevc_intra_pred_filters_luma_mode_11_to_17.s",
+                "common/arm64/ihevc_intra_pred_filters_luma_mode_19_to_25.s",
+                "common/arm64/ihevc_intra_pred_luma_mode_3_to_9.s",
+                "common/arm64/ihevc_padding.s",
+                "decoder/arm64/ihevcd_itrans_recon_dc_luma.s",
+                "decoder/arm64/ihevcd_itrans_recon_dc_chroma.s",
+                "decoder/arm64/ihevcd_fmt_conv_420sp_to_420p.s",
+                "decoder/arm64/ihevcd_fmt_conv_420sp_to_420sp.s",
+                "decoder/arm64/ihevcd_fmt_conv_420sp_to_rgba8888.s",
+            ],
+        },
+
+        arm: {
+            local_include_dirs: [
+                "decoder/arm",
+                "common/arm",
+            ],
+
+            srcs: [
+                "decoder/arm/ihevcd_function_selector.c",
+                "decoder/arm/ihevcd_function_selector_noneon.c",
+            ],
+
+            cflags: [
+                "-DDISABLE_NEONINTR",
+                "-DARM",
+                "-DARMGCC",
+                "-fno-tree-vectorize",
+
+                // These will be overriden by armv7_a_neon
+                "-DDISABLE_NEON",
+                "-DDEFAULT_ARCH=D_ARCH_ARM_NONEON",
+            ],
+
+            instruction_set: "arm",
+
+            armv7_a_neon: {
+                srcs: [
+                    "decoder/arm/ihevcd_function_selector_a9q.c",
+                    "common/arm/ihevc_intra_ref_substitution_a9q.c",
+                    "common/arm/ihevc_intra_pred_filters_neon_intr.c",
+                    "common/arm/ihevc_weighted_pred_neon_intr.c",
+                    "common/arm/ihevc_mem_fns.s",
+                    "common/arm/ihevc_itrans_recon_32x32.s",
+                    "common/arm/ihevc_weighted_pred_bi_default.s",
+                    "common/arm/ihevc_weighted_pred_bi.s",
+                    "common/arm/ihevc_weighted_pred_uni.s",
+                    "common/arm/ihevc_deblk_luma_horz.s",
+                    "common/arm/ihevc_deblk_luma_vert.s",
+                    "common/arm/ihevc_deblk_chroma_vert.s",
+                    "common/arm/ihevc_deblk_chroma_horz.s",
+                    "common/arm/ihevc_sao_band_offset_luma.s",
+                    "common/arm/ihevc_sao_band_offset_chroma.s",
+                    "common/arm/ihevc_sao_edge_offset_class0.s",
+                    "common/arm/ihevc_sao_edge_offset_class0_chroma.s",
+                    "common/arm/ihevc_sao_edge_offset_class1.s",
+                    "common/arm/ihevc_sao_edge_offset_class1_chroma.s",
+                    "common/arm/ihevc_sao_edge_offset_class2.s",
+                    "common/arm/ihevc_sao_edge_offset_class2_chroma.s",
+                    "common/arm/ihevc_sao_edge_offset_class3.s",
+                    "common/arm/ihevc_sao_edge_offset_class3_chroma.s",
+                    "common/arm/ihevc_inter_pred_luma_horz_w16out.s",
+                    "common/arm/ihevc_inter_pred_filters_luma_horz.s",
+                    "common/arm/ihevc_inter_pred_filters_luma_vert.s",
+                    "common/arm/ihevc_inter_pred_chroma_horz.s",
+                    "common/arm/ihevc_inter_pred_chroma_horz_w16out.s",
+                    "common/arm/ihevc_inter_pred_chroma_vert.s",
+                    "common/arm/ihevc_inter_pred_chroma_vert_w16out.s",
+                    "common/arm/ihevc_inter_pred_chroma_vert_w16inp.s",
+                    "common/arm/ihevc_inter_pred_chroma_vert_w16inp_w16out.s",
+                    "common/arm/ihevc_inter_pred_filters_luma_vert_w16inp.s",
+                    "common/arm/ihevc_inter_pred_luma_vert_w16inp_w16out.s",
+                    "common/arm/ihevc_inter_pred_luma_copy_w16out.s",
+                    "common/arm/ihevc_inter_pred_luma_copy.s",
+                    "common/arm/ihevc_inter_pred_chroma_copy.s",
+                    "common/arm/ihevc_inter_pred_chroma_copy_w16out.s",
+                    "common/arm/ihevc_itrans_recon_4x4_ttype1.s",
+                    "common/arm/ihevc_itrans_recon_4x4.s",
+                    "common/arm/ihevc_itrans_recon_8x8.s",
+                    "common/arm/ihevc_itrans_recon_16x16.s",
+                    "common/arm/ihevc_intra_pred_chroma_planar.s",
+                    "common/arm/ihevc_intra_pred_chroma_dc.s",
+                    "common/arm/ihevc_intra_pred_chroma_horz.s",
+                    "common/arm/ihevc_intra_pred_chroma_ver.s",
+                    "common/arm/ihevc_intra_pred_chroma_mode2.s",
+                    "common/arm/ihevc_intra_pred_chroma_mode_18_34.s",
+                    "common/arm/ihevc_intra_pred_filters_chroma_mode_11_to_17.s",
+                    "common/arm/ihevc_intra_pred_filters_chroma_mode_19_to_25.s",
+                    "common/arm/ihevc_intra_pred_chroma_mode_3_to_9.s",
+                    "common/arm/ihevc_intra_pred_chroma_mode_27_to_33.s",
+                    "common/arm/ihevc_intra_pred_luma_planar.s",
+                    "common/arm/ihevc_intra_pred_luma_horz.s",
+                    "common/arm/ihevc_intra_pred_luma_mode2.s",
+                    "common/arm/ihevc_intra_pred_luma_mode_27_to_33.s",
+                    "common/arm/ihevc_intra_pred_luma_mode_18_34.s",
+                    "common/arm/ihevc_intra_pred_luma_vert.s",
+                    "common/arm/ihevc_intra_pred_luma_dc.s",
+                    "common/arm/ihevc_intra_pred_filters_luma_mode_11_to_17.s",
+                    "common/arm/ihevc_intra_pred_filters_luma_mode_19_to_25.s",
+                    "common/arm/ihevc_intra_pred_luma_mode_3_to_9.s",
+                    "common/arm/ihevc_padding.s",
+                    "decoder/arm/ihevcd_itrans_recon_dc_luma.s",
+                    "decoder/arm/ihevcd_itrans_recon_dc_chroma.s",
+                    "decoder/arm/ihevcd_fmt_conv_420sp_to_420p.s",
+                    "decoder/arm/ihevcd_fmt_conv_420sp_to_420sp.s",
+                    "decoder/arm/ihevcd_fmt_conv_420sp_to_rgba8888.s",
+                ],
+                cflags: [
+                    "-UDISABLE_NEON",
+                    "-UDEFAULT_ARCH",
+                    "-DDEFAULT_ARCH=D_ARCH_ARM_A9Q",
+                ],
+            },
+        },
+
+        mips64: {
+            local_include_dirs: [
+                "decoder/mips",
+                "common/mips",
+            ],
+
+            srcs: [
+                "decoder/mips/ihevcd_function_selector.c",
+                "decoder/mips/ihevcd_function_selector_mips_generic.c",
+            ],
+        },
+
+        mips: {
+            local_include_dirs: [
+                "decoder/mips",
+                "common/mips",
+            ],
+
+            srcs: [
+                "decoder/mips/ihevcd_function_selector.c",
+                "decoder/mips/ihevcd_function_selector_mips_generic.c",
+            ],
+        },
+
+        x86_64: {
+            cflags: [
+                "-DX86",
+                "-DDISABLE_AVX2",
+                "-msse4.2",
+                "-mno-avx",
+                "-DDEFAULT_ARCH=D_ARCH_X86_SSE42",
+            ],
+
+            local_include_dirs: [
+                "decoder/x86",
+                "common/x86",
+            ],
+
+            srcs: [
+                "decoder/x86/ihevcd_function_selector.c",
+                "decoder/x86/ihevcd_function_selector_generic.c",
+                "decoder/x86/ihevcd_function_selector_ssse3.c",
+                "decoder/x86/ihevcd_function_selector_sse42.c",
+                "common/x86/ihevc_inter_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_weighted_pred_ssse3_intr.c",
+                "common/x86/ihevc_intra_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_16x16_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_32x32_ssse3_intr.c",
+                "common/x86/ihevc_sao_ssse3_intr.c",
+                "common/x86/ihevc_deblk_ssse3_intr.c",
+                "common/x86/ihevc_padding_ssse3_intr.c",
+                "common/x86/ihevc_mem_fns_ssse3_intr.c",
+                "decoder/x86/ihevcd_fmt_conv_ssse3_intr.c",
+                "decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c",
+                "common/x86/ihevc_inter_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_weighted_pred_sse42_intr.c",
+                "common/x86/ihevc_intra_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_16x16_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_32x32_itrans_recon_sse42_intr.c",
+                "decoder/x86/ihevcd_it_rec_dc_sse42_intr.c",
+                "common/x86/ihevc_tables_x86_intr.c",
+            ],
+        },
+
+        x86: {
+            cflags: [
+                "-DX86",
+                "-DDISABLE_AVX2",
+                "-msse4.2",
+                "-mno-avx",
+                "-DDEFAULT_ARCH=D_ARCH_X86_SSE42",
+            ],
+
+            local_include_dirs: [
+                "decoder/x86",
+                "common/x86",
+            ],
+
+            srcs: [
+                "decoder/x86/ihevcd_function_selector.c",
+                "decoder/x86/ihevcd_function_selector_generic.c",
+                "decoder/x86/ihevcd_function_selector_ssse3.c",
+                "decoder/x86/ihevcd_function_selector_sse42.c",
+                "common/x86/ihevc_inter_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_weighted_pred_ssse3_intr.c",
+                "common/x86/ihevc_intra_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_16x16_ssse3_intr.c",
+                "common/x86/ihevc_itrans_recon_32x32_ssse3_intr.c",
+                "common/x86/ihevc_sao_ssse3_intr.c",
+                "common/x86/ihevc_deblk_ssse3_intr.c",
+                "common/x86/ihevc_padding_ssse3_intr.c",
+                "common/x86/ihevc_mem_fns_ssse3_intr.c",
+                "decoder/x86/ihevcd_fmt_conv_ssse3_intr.c",
+                "decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c",
+                "common/x86/ihevc_inter_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_weighted_pred_sse42_intr.c",
+                "common/x86/ihevc_intra_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c",
+                "common/x86/ihevc_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_16x16_itrans_recon_sse42_intr.c",
+                "common/x86/ihevc_32x32_itrans_recon_sse42_intr.c",
+                "decoder/x86/ihevcd_it_rec_dc_sse42_intr.c",
+                "common/x86/ihevc_tables_x86_intr.c",
+            ],
+        },
+    },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 4668c52..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-# decoder
-include $(LOCAL_PATH)/decoder.mk
-
diff --git a/decoder.arm.mk b/decoder.arm.mk
deleted file mode 100644
index 91a52e6..0000000
--- a/decoder.arm.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-libhevcd_inc_dir_arm   +=  $(LOCAL_PATH)/decoder/arm
-libhevcd_inc_dir_arm   +=  $(LOCAL_PATH)/common/arm
-
-libhevcd_srcs_c_arm    +=  decoder/arm/ihevcd_function_selector.c
-libhevcd_srcs_c_arm    +=  decoder/arm/ihevcd_function_selector_noneon.c
-libhevcd_cflags_arm    += -DDISABLE_NEONINTR  -DARM -DARMGCC -fno-tree-vectorize
-
-LOCAL_ARM_MODE         := arm
-
-ifeq ($(ARCH_ARM_HAVE_NEON),true)
-libhevcd_srcs_c_arm    +=  decoder/arm/ihevcd_function_selector_a9q.c
-libhevcd_srcs_c_arm    +=  common/arm/ihevc_intra_ref_substitution_a9q.c
-libhevcd_srcs_c_arm    +=  common/arm/ihevc_intra_pred_filters_neon_intr.c
-libhevcd_srcs_c_arm    +=  common/arm/ihevc_weighted_pred_neon_intr.c
-
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_mem_fns.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_itrans_recon_32x32.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_weighted_pred_bi_default.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_weighted_pred_bi.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_weighted_pred_uni.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_deblk_luma_horz.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_deblk_luma_vert.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_deblk_chroma_vert.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_deblk_chroma_horz.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_band_offset_luma.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_band_offset_chroma.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class0.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class0_chroma.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class1.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class1_chroma.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class2.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class2_chroma.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class3.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_sao_edge_offset_class3_chroma.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_luma_horz_w16out.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_filters_luma_horz.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_filters_luma_vert.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_horz.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_horz_w16out.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_vert.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_vert_w16out.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_vert_w16inp.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_vert_w16inp_w16out.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_filters_luma_vert_w16inp.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_luma_vert_w16inp_w16out.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_luma_copy_w16out.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_luma_copy.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_copy.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_inter_pred_chroma_copy_w16out.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_itrans_recon_4x4_ttype1.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_itrans_recon_4x4.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_itrans_recon_8x8.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_itrans_recon_16x16.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_planar.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_dc.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_horz.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_ver.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_mode2.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_mode_18_34.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_filters_chroma_mode_11_to_17.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_filters_chroma_mode_19_to_25.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_mode_3_to_9.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_chroma_mode_27_to_33.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_planar.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_horz.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_mode2.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_mode_27_to_33.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_mode_18_34.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_vert.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_dc.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_filters_luma_mode_11_to_17.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_filters_luma_mode_19_to_25.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_intra_pred_luma_mode_3_to_9.s
-libhevcd_srcs_asm_arm   +=  common/arm/ihevc_padding.s
-
-libhevcd_srcs_asm_arm    +=  decoder/arm/ihevcd_itrans_recon_dc_luma.s
-libhevcd_srcs_asm_arm    +=  decoder/arm/ihevcd_itrans_recon_dc_chroma.s
-libhevcd_srcs_asm_arm    +=  decoder/arm/ihevcd_fmt_conv_420sp_to_420p.s
-libhevcd_srcs_asm_arm    +=  decoder/arm/ihevcd_fmt_conv_420sp_to_420sp.s
-libhevcd_srcs_asm_arm    +=  decoder/arm/ihevcd_fmt_conv_420sp_to_rgba8888.s
-libhevcd_cflags_arm += -DDEFAULT_ARCH=D_ARCH_ARM_A9Q
-else
-libhevcd_cflags_arm += -DDISABLE_NEON -DDEFAULT_ARCH=D_ARCH_ARM_NONEON
-endif
-
-LOCAL_SRC_FILES_arm += $(libhevcd_srcs_c_arm) $(libhevcd_srcs_asm_arm)
-LOCAL_C_INCLUDES_arm += $(libhevcd_inc_dir_arm)
-LOCAL_CFLAGS_arm += $(libhevcd_cflags_arm)
diff --git a/decoder.arm64.mk b/decoder.arm64.mk
deleted file mode 100644
index 2e6ec23..0000000
--- a/decoder.arm64.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-libhevcd_cflags_arm64 += -DARMV8
-libhevcd_cflags_arm64 += -DDISABLE_NEONINTR  -DARM -DARMGCC
-
-libhevcd_inc_dir_arm64   +=  $(LOCAL_PATH)/decoder/arm
-libhevcd_inc_dir_arm64   +=  $(LOCAL_PATH)/common/arm
-libhevcd_inc_dir_arm64   +=  $(LOCAL_PATH)/decoder/arm64
-libhevcd_inc_dir_arm64   +=  $(LOCAL_PATH)/common/arm64
-
-libhevcd_srcs_c_arm64    +=  decoder/arm/ihevcd_function_selector.c
-libhevcd_srcs_c_arm64    +=  decoder/arm/ihevcd_function_selector_noneon.c
-
-libhevcd_srcs_c_arm64    +=  decoder/arm64/ihevcd_function_selector_av8.c
-
-libhevcd_srcs_c_arm64    +=  common/arm/ihevc_intra_pred_filters_neon_intr.c
-libhevcd_srcs_c_arm64    +=  common/arm/ihevc_weighted_pred_neon_intr.c
-
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_mem_fns.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_itrans_recon_32x32.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_weighted_pred_bi_default.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_weighted_pred_bi.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_weighted_pred_uni.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_deblk_luma_horz.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_deblk_luma_vert.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_deblk_chroma_vert.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_deblk_chroma_horz.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_band_offset_luma.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_band_offset_chroma.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class0.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class0_chroma.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class1.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class1_chroma.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class2.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class2_chroma.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class3.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_sao_edge_offset_class3_chroma.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_luma_horz_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_filters_luma_horz.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_filters_luma_vert.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_horz.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_horz_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_vert.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_vert_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_vert_w16inp.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_vert_w16inp_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_filters_luma_vert_w16inp.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_filters_luma_vert_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_luma_vert_w16inp_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_luma_copy_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_luma_copy.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_copy.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_inter_pred_chroma_copy_w16out.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_itrans_recon_4x4_ttype1.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_itrans_recon_4x4.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_itrans_recon_8x8.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_itrans_recon_16x16.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_planar.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_dc.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_horz.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_ver.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_mode2.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_mode_18_34.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_filters_chroma_mode_11_to_17.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_filters_chroma_mode_19_to_25.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_mode_3_to_9.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_chroma_mode_27_to_33.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_planar.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_horz.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_mode2.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_mode_27_to_33.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_mode_18_34.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_vert.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_dc.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_filters_luma_mode_11_to_17.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_filters_luma_mode_19_to_25.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_intra_pred_luma_mode_3_to_9.s
-libhevcd_srcs_asm_arm64   +=  common/arm64/ihevc_padding.s
-
-
-
-libhevcd_srcs_asm_arm64    +=  decoder/arm64/ihevcd_itrans_recon_dc_luma.s
-libhevcd_srcs_asm_arm64    +=  decoder/arm64/ihevcd_itrans_recon_dc_chroma.s
-libhevcd_srcs_asm_arm64    +=  decoder/arm64/ihevcd_fmt_conv_420sp_to_420p.s
-libhevcd_srcs_asm_arm64    +=  decoder/arm64/ihevcd_fmt_conv_420sp_to_420sp.s
-libhevcd_srcs_asm_arm64    +=  decoder/arm64/ihevcd_fmt_conv_420sp_to_rgba8888.s
-
-libhevcd_cflags_arm64 += -DDEFAULT_ARCH=D_ARCH_ARMV8_GENERIC
-
-
-
-
-LOCAL_SRC_FILES_arm64 += $(libhevcd_srcs_c_arm64) $(libhevcd_srcs_asm_arm64)
-LOCAL_C_INCLUDES_arm64 += $(libhevcd_inc_dir_arm64)
-LOCAL_CFLAGS_arm64 += $(libhevcd_cflags_arm64)
-
-# Clang doesn't pass -I flags to the assembler when building a .s file.
-# We need to tell it to pass them to the assembler specifically (doesn't hurt
-# with gcc either, and may actually help future gcc versions if they decide
-# to start making a difference between assembly and C includes).
-comma := ,
-LOCAL_ASFLAGS_arm64 += $(addprefix -Wa$(comma)-I,$(libhevcd_inc_dir_arm64))
diff --git a/decoder.mips.mk b/decoder.mips.mk
deleted file mode 100644
index 2aecc09..0000000
--- a/decoder.mips.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-libhevcd_inc_dir_mips   +=  $(LOCAL_PATH)/decoder/mips
-libhevcd_inc_dir_mips   +=  $(LOCAL_PATH)/common/mips
-
-libhevcd_srcs_c_mips    +=  decoder/mips/ihevcd_function_selector.c
-libhevcd_srcs_c_mips    +=  decoder/mips/ihevcd_function_selector_mips_generic.c
-
-
-LOCAL_SRC_FILES_mips += $(libhevcd_srcs_c_mips) $(libhevcd_srcs_asm_mips)
-LOCAL_C_INCLUDES_mips += $(libhevcd_inc_dir_mips)
-LOCAL_CFLAGS_mips += $(libhevcd_cflags_mips)
-
-
-
diff --git a/decoder.mips64.mk b/decoder.mips64.mk
deleted file mode 100644
index 81b5852..0000000
--- a/decoder.mips64.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-libhevcd_inc_dir_mips64 +=  $(LOCAL_PATH)/decoder/mips
-libhevcd_inc_dir_mips64 +=  $(LOCAL_PATH)/common/mips
-
-libhevcd_srcs_c_mips64  +=  decoder/mips/ihevcd_function_selector.c
-libhevcd_srcs_c_mips64  +=  decoder/mips/ihevcd_function_selector_mips_generic.c
-
-LOCAL_SRC_FILES_mips64 += $(libhevcd_srcs_c_mips64) $(libhevcd_srcs_asm_mips64)
-LOCAL_C_INCLUDES_mips64 += $(libhevcd_inc_dir_mips64)
-LOCAL_CFLAGS_mips64 += $(libhevcd_cflags_mips64)
-
diff --git a/decoder.mk b/decoder.mk
deleted file mode 100644
index 416fee7..0000000
--- a/decoder.mk
+++ /dev/null
@@ -1,90 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-libhevc_source_dir := $(LOCAL_PATH)
-
-## Arch-common settings
-LOCAL_MODULE := libhevcdec
-#LOCAL_32_BIT_ONLY := true
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-
-LOCAL_CFLAGS += -D_LIB -DMULTICORE -fPIC
-LOCAL_CFLAGS += -O3 -DANDROID
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/decoder $(LOCAL_PATH)/common
-
-libhevcd_srcs_c   +=  common/ihevc_quant_tables.c
-libhevcd_srcs_c   +=  common/ihevc_inter_pred_filters.c
-libhevcd_srcs_c   +=  common/ihevc_weighted_pred.c
-libhevcd_srcs_c   +=  common/ihevc_padding.c
-libhevcd_srcs_c   +=  common/ihevc_deblk_edge_filter.c
-libhevcd_srcs_c   +=  common/ihevc_deblk_tables.c
-libhevcd_srcs_c   +=  common/ihevc_cabac_tables.c
-libhevcd_srcs_c   +=  common/ihevc_common_tables.c
-libhevcd_srcs_c   +=  common/ihevc_intra_pred_filters.c
-libhevcd_srcs_c   +=  common/ihevc_chroma_intra_pred_filters.c
-libhevcd_srcs_c   +=  common/ihevc_mem_fns.c
-libhevcd_srcs_c   +=  common/ihevc_sao.c
-libhevcd_srcs_c   +=  common/ihevc_trans_tables.c
-libhevcd_srcs_c   +=  common/ihevc_recon.c
-libhevcd_srcs_c   +=  common/ihevc_itrans.c
-libhevcd_srcs_c   +=  common/ihevc_itrans_recon.c
-libhevcd_srcs_c   +=  common/ihevc_iquant_recon.c
-libhevcd_srcs_c   +=  common/ihevc_iquant_itrans_recon.c
-libhevcd_srcs_c   +=  common/ihevc_itrans_recon_32x32.c
-libhevcd_srcs_c   +=  common/ihevc_itrans_recon_16x16.c
-libhevcd_srcs_c   +=  common/ihevc_itrans_recon_8x8.c
-libhevcd_srcs_c   +=  common/ihevc_chroma_itrans_recon.c
-libhevcd_srcs_c   +=  common/ihevc_chroma_iquant_recon.c
-libhevcd_srcs_c   +=  common/ihevc_chroma_iquant_itrans_recon.c
-libhevcd_srcs_c   +=  common/ihevc_chroma_recon.c
-libhevcd_srcs_c   +=  common/ihevc_chroma_itrans_recon_16x16.c
-libhevcd_srcs_c   +=  common/ihevc_chroma_itrans_recon_8x8.c
-libhevcd_srcs_c   +=  common/ihevc_buf_mgr.c
-libhevcd_srcs_c   +=  common/ihevc_disp_mgr.c
-libhevcd_srcs_c   +=  common/ihevc_dpb_mgr.c
-libhevcd_srcs_c   +=  common/ithread.c
-
-
-
-libhevcd_srcs_c   +=  decoder/ihevcd_version.c
-libhevcd_srcs_c   +=  decoder/ihevcd_api.c
-libhevcd_srcs_c   +=  decoder/ihevcd_decode.c
-libhevcd_srcs_c   +=  decoder/ihevcd_nal.c
-libhevcd_srcs_c   +=  decoder/ihevcd_bitstream.c
-libhevcd_srcs_c   +=  decoder/ihevcd_parse_headers.c
-libhevcd_srcs_c   +=  decoder/ihevcd_parse_slice_header.c
-libhevcd_srcs_c   +=  decoder/ihevcd_parse_slice.c
-libhevcd_srcs_c   +=  decoder/ihevcd_parse_residual.c
-libhevcd_srcs_c   +=  decoder/ihevcd_cabac.c
-libhevcd_srcs_c   +=  decoder/ihevcd_intra_pred_mode_prediction.c
-libhevcd_srcs_c   +=  decoder/ihevcd_process_slice.c
-libhevcd_srcs_c   +=  decoder/ihevcd_utils.c
-libhevcd_srcs_c   +=  decoder/ihevcd_job_queue.c
-libhevcd_srcs_c   +=  decoder/ihevcd_ref_list.c
-libhevcd_srcs_c   +=  decoder/ihevcd_get_mv.c
-libhevcd_srcs_c   +=  decoder/ihevcd_mv_pred.c
-libhevcd_srcs_c   +=  decoder/ihevcd_mv_merge.c
-libhevcd_srcs_c   +=  decoder/ihevcd_iquant_itrans_recon_ctb.c
-libhevcd_srcs_c   +=  decoder/ihevcd_itrans_recon_dc.c
-libhevcd_srcs_c   +=  decoder/ihevcd_common_tables.c
-libhevcd_srcs_c   +=  decoder/ihevcd_boundary_strength.c
-libhevcd_srcs_c   +=  decoder/ihevcd_deblk.c
-libhevcd_srcs_c   +=  decoder/ihevcd_inter_pred.c
-libhevcd_srcs_c   +=  decoder/ihevcd_sao.c
-libhevcd_srcs_c   +=  decoder/ihevcd_ilf_padding.c
-libhevcd_srcs_c   +=  decoder/ihevcd_fmt_conv.c
-
-LOCAL_SRC_FILES := $(libhevcd_srcs_c) $(libhevcd_srcs_asm)
-
-
-# Load the arch-specific settings
-include $(LOCAL_PATH)/decoder.arm.mk
-include $(LOCAL_PATH)/decoder.arm64.mk
-include $(LOCAL_PATH)/decoder.x86.mk
-include $(LOCAL_PATH)/decoder.x86_64.mk
-include $(LOCAL_PATH)/decoder.mips.mk
-include $(LOCAL_PATH)/decoder.mips64.mk
-
-include $(BUILD_STATIC_LIBRARY)
diff --git a/decoder.x86.mk b/decoder.x86.mk
deleted file mode 100644
index 768cd06..0000000
--- a/decoder.x86.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-libhevcd_cflags_x86 += -DX86 -DDISABLE_AVX2 -m32 -msse4.2 -mno-avx -DDEFAULT_ARCH=D_ARCH_X86_SSE42
-
-libhevcd_inc_dir_x86   +=  $(LOCAL_PATH)/decoder/x86
-libhevcd_inc_dir_x86   +=  $(LOCAL_PATH)/common/x86
-
-libhevcd_srcs_c_x86    +=  decoder/x86/ihevcd_function_selector.c
-libhevcd_srcs_c_x86    +=  decoder/x86/ihevcd_function_selector_generic.c
-libhevcd_srcs_c_x86    +=  decoder/x86/ihevcd_function_selector_ssse3.c
-libhevcd_srcs_c_x86    +=  decoder/x86/ihevcd_function_selector_sse42.c
-
-
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_inter_pred_filters_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_weighted_pred_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_intra_pred_filters_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_itrans_recon_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_itrans_recon_16x16_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_itrans_recon_32x32_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_sao_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_deblk_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_padding_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_mem_fns_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  decoder/x86/ihevcd_fmt_conv_ssse3_intr.c
-libhevcd_srcs_c_x86    +=  decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c
-
-
-
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_inter_pred_filters_sse42_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_weighted_pred_sse42_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_intra_pred_filters_sse42_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_itrans_recon_sse42_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_16x16_itrans_recon_sse42_intr.c
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_32x32_itrans_recon_sse42_intr.c
-libhevcd_srcs_c_x86    +=  decoder/x86/ihevcd_it_rec_dc_sse42_intr.c
-
-libhevcd_srcs_c_x86    +=  common/x86/ihevc_tables_x86_intr.c
-
-LOCAL_SRC_FILES_x86 += $(libhevcd_srcs_c_x86) $(libhevcd_srcs_asm_x86)
-LOCAL_C_INCLUDES_x86 += $(libhevcd_inc_dir_x86)
-LOCAL_CFLAGS_x86 += $(libhevcd_cflags_x86)
diff --git a/decoder.x86_64.mk b/decoder.x86_64.mk
deleted file mode 100644
index 7c53b87..0000000
--- a/decoder.x86_64.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-libhevcd_cflags_x86_64 += -DX86 -DDISABLE_AVX2 -m64 -msse4.2 -mno-avx  -DDEFAULT_ARCH=D_ARCH_X86_SSE42
-
-libhevcd_inc_dir_x86_64   +=  $(LOCAL_PATH)/decoder/x86
-libhevcd_inc_dir_x86_64   +=  $(LOCAL_PATH)/common/x86
-
-libhevcd_srcs_c_x86_64    +=  decoder/x86/ihevcd_function_selector.c
-libhevcd_srcs_c_x86_64    +=  decoder/x86/ihevcd_function_selector_generic.c
-libhevcd_srcs_c_x86_64    +=  decoder/x86/ihevcd_function_selector_ssse3.c
-libhevcd_srcs_c_x86_64    +=  decoder/x86/ihevcd_function_selector_sse42.c
-
-
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_inter_pred_filters_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_weighted_pred_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_intra_pred_filters_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_chroma_intra_pred_filters_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_itrans_recon_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_itrans_recon_16x16_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_itrans_recon_32x32_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_sao_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_deblk_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_padding_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_mem_fns_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  decoder/x86/ihevcd_fmt_conv_ssse3_intr.c
-libhevcd_srcs_c_x86_64    +=  decoder/x86/ihevcd_it_rec_dc_ssse3_intr.c
-
-
-
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_inter_pred_filters_sse42_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_weighted_pred_sse42_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_intra_pred_filters_sse42_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_chroma_intra_pred_filters_sse42_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_itrans_recon_sse42_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_16x16_itrans_recon_sse42_intr.c
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_32x32_itrans_recon_sse42_intr.c
-libhevcd_srcs_c_x86_64    +=  decoder/x86/ihevcd_it_rec_dc_sse42_intr.c
-
-libhevcd_srcs_c_x86_64    +=  common/x86/ihevc_tables_x86_intr.c
-
-LOCAL_SRC_FILES_x86_64 += $(libhevcd_srcs_c_x86_64) $(libhevcd_srcs_asm_x86_64)
-LOCAL_C_INCLUDES_x86_64 += $(libhevcd_inc_dir_x86_64)
-LOCAL_CFLAGS_x86_64 += $(libhevcd_cflags_x86_64)
-
-
-