Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove diffs #217

Merged
merged 3 commits into from
Sep 25, 2024
Merged

Remove diffs #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fce30d
Updated clang version for Android 15.
ankithbti52509 Jun 12, 2024
516c4ea
Fix for FILE_NAME_TAG
ankithbti52509 Jun 12, 2024
b48061c
Updated compressing binary in A15.
ankithbti52509 Jun 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/definitions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions releasetools/intel_common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand All @@ -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"
Expand Down
14 changes: 7 additions & 7 deletions tasks/flashfiles.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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))))
Expand All @@ -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))))
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tasks/liveimage.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 \
Expand Down