From 9fc5959cd693e5d22dc81fbc08a20ccf08fdb997 Mon Sep 17 00:00:00 2001 From: nhansp Date: Tue, 13 May 2025 22:04:57 +0700 Subject: [PATCH] cepheus: nuke flash_super_dummy no longer required after releasetools update: https://github.com/Evolution-X/build/commit/98549f6893c3a93057e2d4cdd1015a93e9473b16 Signed-off-by: nhansp --- Android.mk | 14 -------------- device.mk | 3 --- partitions/flash_super_dummy.sh | 20 -------------------- releasetools.py | 8 -------- 4 files changed, 45 deletions(-) delete mode 100644 partitions/flash_super_dummy.sh diff --git a/Android.mk b/Android.mk index 08406d1..3141ab4 100644 --- a/Android.mk +++ b/Android.mk @@ -20,20 +20,6 @@ ifeq ($(TARGET_DEVICE),cepheus) include $(call all-makefiles-under,$(LOCAL_PATH)) -LPFLASH := $(HOST_OUT_EXECUTABLES)/lpflash$(HOST_EXECUTABLE_SUFFIX) -INSTALLED_SUPERIMAGE_DUMMY_TARGET := $(PRODUCT_OUT)/super_dummy.img - -$(INSTALLED_SUPERIMAGE_DUMMY_TARGET): $(PRODUCT_OUT)/super_empty.img $(LPFLASH) - $(call pretty,"Target dummy super image: $@") - $(hide) touch $@ - $(hide) echo $(CURDIR) - $(hide) $(LPFLASH) $@ $(PRODUCT_OUT)/super_empty.img - -.PHONY: super_dummyimage -super_dummyimage: $(INSTALLED_SUPERIMAGE_DUMMY_TARGET) - -INSTALLED_RADIOIMAGE_TARGET += $(INSTALLED_SUPERIMAGE_DUMMY_TARGET) - include $(CLEAR_VARS) # A/B builds require us to create the mount points at compile time. diff --git a/device.mk b/device.mk index 3067407..3a62b4a 100644 --- a/device.mk +++ b/device.mk @@ -402,9 +402,6 @@ PRODUCT_PACKAGES += \ # Partitions PRODUCT_USE_DYNAMIC_PARTITIONS := true -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/partitions/flash_super_dummy.sh:install/bin/flash_super_dummy.sh - # Power PRODUCT_PACKAGES += \ android.hardware.power-service.cepheus-libperfmgr \ diff --git a/partitions/flash_super_dummy.sh b/partitions/flash_super_dummy.sh deleted file mode 100644 index 3015846..0000000 --- a/partitions/flash_super_dummy.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/system/bin/sh -# -# Copyright (C) 2021 The PixelExperience Project -# -# SPDX-License-Identifier: Apache-2.0 -# - -SUPER="/dev/block/by-name/system" - -mkdir /tmp/super-mnt - -mount $SUPER /tmp/super-mnt 2>/dev/null - -if [ "$?" = "0" ]; then - echo "Detected stock /system in super partition, flashing super_dummy.img!" - umount /tmp/super-mnt - dd if=/tmp/super_dummy.img of=$SUPER -fi - -rmdir /tmp/super-mnt diff --git a/releasetools.py b/releasetools.py index b37baee..8146664 100644 --- a/releasetools.py +++ b/releasetools.py @@ -17,14 +17,6 @@ import common import re -def FullOTA_InstallBegin(info): - input_zip = info.input_zip - AddImage(info, "RADIO", input_zip, "super_dummy.img", "/tmp/super_dummy.img"); - info.script.AppendExtra('package_extract_file("install/bin/flash_super_dummy.sh", "/tmp/flash_super_dummy.sh");') - info.script.AppendExtra('set_metadata("/tmp/flash_super_dummy.sh", "uid", 0, "gid", 0, "mode", 0755);') - info.script.AppendExtra('run_program("/tmp/flash_super_dummy.sh");') - return - def FullOTA_InstallEnd(info): input_zip = info.input_zip OTA_InstallEnd(info, input_zip)