diff --git a/bsp_diff/caas/device/intel/mixins/0004-Remove-32bit-support-in-AOSP14.patch b/bsp_diff/caas/device/intel/mixins/0004-Remove-32bit-support-in-AOSP14.patch deleted file mode 100644 index d513a60d41..0000000000 --- a/bsp_diff/caas/device/intel/mixins/0004-Remove-32bit-support-in-AOSP14.patch +++ /dev/null @@ -1,59 +0,0 @@ -From dc16edb223befbed426e07eb81a508afe0468277 Mon Sep 17 00:00:00 2001 -From: "Shi, Qiming" -Date: Thu, 11 Apr 2024 23:08:13 +0800 -Subject: [PATCH] Remove 32bit support in AOSP14 - -Signed-off-by: Shi, Qiming ---- - groups/cpu-arch/x86/BoardConfig.mk | 5 ----- - groups/houdini/true/BoardConfig.mk | 8 ++------ - 2 files changed, 2 insertions(+), 11 deletions(-) - -diff --git a/groups/cpu-arch/x86/BoardConfig.mk b/groups/cpu-arch/x86/BoardConfig.mk -index c38eead..955e7b4 100644 ---- a/groups/cpu-arch/x86/BoardConfig.mk -+++ b/groups/cpu-arch/x86/BoardConfig.mk -@@ -1,7 +1,6 @@ - BUILD_CPU_ARCH ?= silvermont - - # Items that are common between slm 32b and 64b: --TARGET_CPU_ABI_LIST_32_BIT := x86 - TARGET_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH),x86) - TARGET_CPU_VARIANT := generic - TARGET_CPU_SMP := true -@@ -10,10 +9,6 @@ ifeq ($(BOARD_USE_64BIT_USERSPACE),true) - # 64b-specific items: - TARGET_ARCH := x86_64 - TARGET_CPU_ABI := x86_64 --TARGET_2ND_CPU_ABI := x86 --TARGET_2ND_ARCH := x86 --TARGET_2ND_ARCH_VARIANT := $(if $(BUILD_CPU_ARCH),$(BUILD_CPU_ARCH)) --TARGET_2ND_CPU_VARIANT := generic - else - # 32b-specific items: - TARGET_ARCH := x86 -diff --git a/groups/houdini/true/BoardConfig.mk b/groups/houdini/true/BoardConfig.mk -index cd080a1..7435e3b 100644 ---- a/groups/houdini/true/BoardConfig.mk -+++ b/groups/houdini/true/BoardConfig.mk -@@ -1,15 +1,11 @@ - # Native Bridge ABI List --NB_ABI_LIST_32_BIT := armeabi-v7a armeabi - NB_ABI_LIST_64_BIT := arm64-v8a - # Support 64 Bit Apps - TARGET_CPU_ABI_LIST_64_BIT ?= $(TARGET_CPU_ABI) $(TARGET_CPU_ABI2) --TARGET_CPU_ABI_LIST_32_BIT ?= $(TARGET_2ND_CPU_ABI) $(TARGET_2ND_CPU_ABI2) - TARGET_CPU_ABI_LIST := \ - $(TARGET_CPU_ABI_LIST_64_BIT) \ -- $(TARGET_CPU_ABI_LIST_32_BIT) \ -- $(NB_ABI_LIST_64_BIT) \ -- $(NB_ABI_LIST_32_BIT) --TARGET_CPU_ABI_LIST_32_BIT += $(NB_ABI_LIST_32_BIT) -+ $(NB_ABI_LIST_64_BIT) -+ - TARGET_CPU_ABI_LIST_64_BIT += $(NB_ABI_LIST_64_BIT) - - BOARD_SEPOLICY_DIRS += $(INTEL_PATH_SEPOLICY)/houdini --- -2.34.1 - diff --git a/bsp_diff/caas/device/intel/mixins/0005-Remove-omx-interface-in-AAOS14.patch b/bsp_diff/caas/device/intel/mixins/0005-Remove-omx-interface-in-AAOS14.patch deleted file mode 100644 index 5bee69ab13..0000000000 --- a/bsp_diff/caas/device/intel/mixins/0005-Remove-omx-interface-in-AAOS14.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2c38b97b3072872044ea6324f7895b27a52c03b6 Mon Sep 17 00:00:00 2001 -From: "Shi, Qiming" -Date: Fri, 2 Aug 2024 04:43:58 +0000 -Subject: [PATCH] Remove omx interface in AAOS14 - -Change-Id: Iae2ed19f2f1ffb3e3f3b2f384a0e3c01ed4e3599 -Signed-off-by: Shi, Qiming ---- - groups/device-specific/caas/framework_manifest.xml | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/groups/device-specific/caas/framework_manifest.xml b/groups/device-specific/caas/framework_manifest.xml -index 055afcd..851c120 100644 ---- a/groups/device-specific/caas/framework_manifest.xml -+++ b/groups/device-specific/caas/framework_manifest.xml -@@ -97,19 +97,6 @@ - default - - -- -- android.hardware.media.omx -- hwbinder -- 1.0 -- -- IOmx -- default -- -- -- IOmxStore -- default -- -- -