From a2d7c89e2d67b8f3ac59b2dac013694eb04d3575 Mon Sep 17 00:00:00 2001 From: Tanuj Tekriwal Date: Wed, 25 Sep 2024 03:42:33 +0000 Subject: [PATCH] Remove the device-intel-build common patches This patch removes the diff patches and moves to actual repo. Tests Done: Build and boot Tracked-On: OAM-124594 Signed-off-by: Tanuj Tekriwal --- ...Updated-clang-version-for-Android-15.patch | 34 ---------- .../build/0002-WA-Fix-for-FILE_NAME_TAG.patch | 66 ------------------- ...04-Updated-compressing-binary-in-A15.patch | 63 ------------------ 3 files changed, 163 deletions(-) delete mode 100644 bsp_diff/common/device/intel/build/0001-Updated-clang-version-for-Android-15.patch delete mode 100644 bsp_diff/common/device/intel/build/0002-WA-Fix-for-FILE_NAME_TAG.patch delete mode 100644 bsp_diff/common/device/intel/build/0004-Updated-compressing-binary-in-A15.patch diff --git a/bsp_diff/common/device/intel/build/0001-Updated-clang-version-for-Android-15.patch b/bsp_diff/common/device/intel/build/0001-Updated-clang-version-for-Android-15.patch deleted file mode 100644 index 82ce0c148d..0000000000 --- a/bsp_diff/common/device/intel/build/0001-Updated-clang-version-for-Android-15.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c9fd2715e9687554064fd0bf0dcc84bc3042f15d Mon Sep 17 00:00:00 2001 -From: Ankit Agarwal -Date: Wed, 12 Jun 2024 16:52:49 +0530 -Subject: [PATCH] Updated clang version for Android 15. - -Updating clang version to 18 in Android 15. - -Tests: Prepared EB, there is no issue. - -Tracked-On: NA -Signed-off-by: Ankit Agarwal ---- - core/definitions.mk | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/definitions.mk b/core/definitions.mk -index 06b60a7..7b78bb7 100755 ---- a/core/definitions.mk -+++ b/core/definitions.mk -@@ -107,9 +107,9 @@ IAFW_CC := $(IAFW_TOOLS_CLANG_PREFIX)/clang - IAFW_OBJCOPY := $(IAFW_TOOLS_GCC_PREFIX)objcopy$(HOST_EXECUTABLE_SUFFIX) - EFI_OBJCOPY := $(IAFW_OBJCOPY) - ifeq ($(TARGET_IAFW_ARCH),x86_64) --IAFW_LIBCLANG := $(IAFW_TOOLCHAIN_CLANG_ROOT)/../lib/clang/17.0.2/lib/linux/libclang_rt.builtins-x86_64-android.a -+IAFW_LIBCLANG := $(IAFW_TOOLCHAIN_CLANG_ROOT)/../lib/clang/18/lib/linux/libclang_rt.builtins-x86_64-android.a - else --IAFW_LIBCLANG := $(IAFW_TOOLCHAIN_CLANG_ROOT)/../lib/clang/17.0.2/lib/linux/libclang_rt.builtins-i686-android.a -+IAFW_LIBCLANG := $(IAFW_TOOLCHAIN_CLANG_ROOT)/../lib/clang/18/lib/linux/libclang_rt.builtins-i686-android.a - endif - - # Transformation definitions, ala build system's definitions.mk --- -2.34.1 - diff --git a/bsp_diff/common/device/intel/build/0002-WA-Fix-for-FILE_NAME_TAG.patch b/bsp_diff/common/device/intel/build/0002-WA-Fix-for-FILE_NAME_TAG.patch deleted file mode 100644 index ca60dbea70..0000000000 --- a/bsp_diff/common/device/intel/build/0002-WA-Fix-for-FILE_NAME_TAG.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 8811a0924567b573ec0825d8f9b0264e74435ae9 Mon Sep 17 00:00:00 2001 -From: Ankit Agarwal -Date: Wed, 12 Jun 2024 16:50:48 +0530 -Subject: [PATCH] [WA] Fix for FILE_NAME_TAG - -Getting build error- FILE_NAME_TAG is obsolete. -Replacing it with intel keyword for now. - -Tracked-On: NA -Signed-off-by: Ankit Agarwal ---- - tasks/flashfiles.mk | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/tasks/flashfiles.mk b/tasks/flashfiles.mk -index 297320c..b98f0a0 100755 ---- a/tasks/flashfiles.mk -+++ b/tasks/flashfiles.mk -@@ -6,11 +6,11 @@ ifeq ($(TARGET_BUILD_TYPE),debug) - name := $(name)_debug - endif - ifeq ($(RELEASE_BUILD),true) --flash_name := $(name)-sign-flashfiles-$(FILE_NAME_TAG) --target_name := $(name)-sign-targetfile-$(FILE_NAME_TAG) -+flash_name := $(name)-sign-flashfiles-intel -+target_name := $(name)-sign-targetfile-intel - gpt_name := $(PRODUCT_OUT)/release_sign/$(name).img - endif --name := $(name)-flashfiles-$(FILE_NAME_TAG) -+name := $(name)-flashfiles-intel - BUILDNUM := $(shell $(DATE) +%H%M%3S) - ifeq ($(RELEASE_BUILD),true) - BUILT_RELEASE_FLASH_FILES_PACKAGE := $(PRODUCT_OUT)/$(flash_name).zip -@@ -115,7 +115,7 @@ ifneq ($(FLASHFILE_VARIANTS),) - $(foreach var,$(FLASHFILE_VARIANTS), \ - $(info Adding $(var)) \ - $(eval fn_prefix := $(PRODUCT_OUT)/$(TARGET_PRODUCT)) \ -- $(eval fn_suffix := $(var)-$(FILE_NAME_TAG)) \ -+ $(eval fn_suffix := $(var)-intel) \ - $(eval ff_zip := $(fn_prefix)-flashfiles-$(fn_suffix).$(fn_compress_format)) \ - $(eval INTEL_FACTORY_FLASHFILES_TARGET += $(ff_zip)) \ - $(call dist-for-goals,droidcore,$(ff_zip):$(notdir $(ff_zip)))) -@@ -135,7 +135,7 @@ ifneq ($(TARGET_SKIP_OTA_PACKAGE), true) - $(foreach var,$(OTA_VARIANTS), \ - $(info Adding $(var)) \ - $(eval fn_prefix := $(PRODUCT_OUT)/$(TARGET_PRODUCT)) \ -- $(eval fn_suffix := $(var)-$(FILE_NAME_TAG)) \ -+ $(eval fn_suffix := $(var)-intel) \ - $(eval ota_zip := $(fn_prefix)-ota-$(fn_suffix).zip) \ - $(eval INTEL_OTA_PACKAGES += $(ota_zip)) \ - $(call dist-for-goals,droidcore,$(ota_zip):$(notdir $(ota_zip)))) -@@ -314,9 +314,9 @@ publish_vertical: - endif - - ifeq ($(RELEASE_BUILD),true) --ISO_INSTALL_IMG = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-sign-flashfile-$(FILE_NAME_TAG).iso -+ISO_INSTALL_IMG = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-sign-flashfile-intel.iso - else --ISO_INSTALL_IMG = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-flashfile-$(FILE_NAME_TAG).iso -+ISO_INSTALL_IMG = $(PRODUCT_OUT)/$(TARGET_PRODUCT)-flashfile-intel.iso - endif - ifeq ($(use_tar),true) - ISO_INSTALL_IMG_COMP = $(ISO_INSTALL_IMG).tar.gz --- -2.34.1 - diff --git a/bsp_diff/common/device/intel/build/0004-Updated-compressing-binary-in-A15.patch b/bsp_diff/common/device/intel/build/0004-Updated-compressing-binary-in-A15.patch deleted file mode 100644 index a0ac2dc320..0000000000 --- a/bsp_diff/common/device/intel/build/0004-Updated-compressing-binary-in-A15.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 327ac105466a7f692b3af0ed83961b59ccc91747 Mon Sep 17 00:00:00 2001 -From: Ankit Agarwal -Date: Thu, 20 Jun 2024 10:34:20 +0530 -Subject: [PATCH] Updated compressing binary in A15. - -In A15, its using gzip binary instead of minigzip. - -Tests: Prepared EB, it is successfull. - -Tracked-On: NA -Signed-off-by: Ankit Agarwal ---- - releasetools/intel_common.py | 4 ++-- - tasks/liveimage.mk | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/releasetools/intel_common.py b/releasetools/intel_common.py -index 32184f6..17a37a2 100644 ---- a/releasetools/intel_common.py -+++ b/releasetools/intel_common.py -@@ -600,7 +600,7 @@ def GetFastbootImage(unpack_dir, info_dict=None): - shutil.rmtree(ramdisk_tmp) - raise exc - -- cmd2 = ["minigzip"] -+ cmd2 = ["gzip"] - try: - p2 = common.Run( - cmd2, stdin=p1.stdout, stdout=ramdisk_img.file.fileno()) -@@ -613,7 +613,7 @@ def GetFastbootImage(unpack_dir, info_dict=None): - p2.communicate() - p1.wait() - assert p1.returncode == 0, "mkbootfs of fastboot ramdisk failed" -- assert p2.returncode == 0, "minigzip of fastboot ramdisk failed" -+ assert p2.returncode == 0, "gzip of fastboot ramdisk failed" - - # use MKBOOTIMG from environ, or "mkbootimg" if empty or not set - mkbootimg = os.getenv('MKBOOTIMG') or "mkbootimg" -diff --git a/tasks/liveimage.mk b/tasks/liveimage.mk -index 7edc301..0cbf7a2 100644 ---- a/tasks/liveimage.mk -+++ b/tasks/liveimage.mk -@@ -50,7 +50,7 @@ $(live_ramdisk): \ - $(INSTALLED_RAMDISK_TARGET) \ - $(MKBOOTFS) \ - $(live_initrc) \ -- | $(MINIGZIP) $(ACP) \ -+ | $(GZIP) $(ACP) \ - - $(hide) mkdir -p $(dir $@) - $(hide) rm -rf $(ramdisk_dir) -@@ -63,7 +63,7 @@ $(live_ramdisk): \ - $(hide) echo "import init.live.rc" >> $(ramdisk_dir)/init.rc - $(hide) sed -i -r 's/^[\t ]*(mount_all|mount yaffs|mount ext).*//g' $(ramdisk_dir)/init*.rc - $(hide) $(ACP) $(live_initrc) $(ramdisk_dir) -- $(hide) $(MKBOOTFS) $(ramdisk_dir) | $(MINIGZIP) > $@ -+ $(hide) $(MKBOOTFS) $(ramdisk_dir) | $(GZIP) > $@ - - $(live_bootimage): \ - $(INTEL_PATH_BUILD)/tasks/liveimage.mk \ --- -2.34.1 -