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

November Patches #3

Open
wants to merge 6 commits into
base: 12.1
Choose a base branch
from
Open

November Patches #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a797bd
Bump Security String to 2022-11-05
haggertk Nov 10, 2022
054dfb6
Revert "Generate changelog"
OhMyVenyx Jan 19, 2023
b40b497
Bump Security String to 2022-12-05
haggertk Dec 8, 2022
cd741fd
Revert "core: sysprop: Only show build id"
OhMyVenyx Jan 19, 2023
391a224
Bump Security String to 2023-01-05
haggertk Jan 7, 2023
5c4792f
Revert "releasetools: Unconditionally store recovery.img in non-A/B OTA"
OhMyVenyx Jan 19, 2023
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
3 changes: 0 additions & 3 deletions core/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2270,9 +2270,6 @@ $(recovery_ramdisk): $(recovery_uncompressed_ramdisk) $(COMPRESSION_COMMAND_DEPS
# $(1): output file
# $(2): optional kernel file
define build-recoveryimage-target
@echo "Generating Changelog"
$(hide) ./vendor/nusantara/tools/changelog
$(hide) mv $(PRODUCT_OUT)/Changelog.txt $(PRODUCT_OUT)/$(TARGET_PRODUCT)-Changelog.txt
$(if $(filter true,$(PRODUCT_SUPPORTS_VBOOT)), \
$(MKBOOTIMG) $(if $(strip $(2)),--kernel $(strip $(2))) $(INTERNAL_RECOVERYIMAGE_ARGS) \
$(INTERNAL_MKBOOTIMG_VERSION_ARGS) $(BOARD_RECOVERY_MKBOOTIMG_ARGS) \
Expand Down
6 changes: 3 additions & 3 deletions core/sysprop.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,13 @@ ifeq ($(TARGET_BUILD_VARIANT),user)

# Dev. branches should have DISPLAY_BUILD_NUMBER set
ifeq (true,$(DISPLAY_BUILD_NUMBER))
BUILD_DISPLAY_ID := $(BUILD_ID)
BUILD_DISPLAY_ID := $(BUILD_ID).$(BUILD_NUMBER_FROM_FILE) $(BUILD_KEYS)
else
BUILD_DISPLAY_ID := $(BUILD_ID)
BUILD_DISPLAY_ID := $(BUILD_ID) $(BUILD_KEYS)
endif
else
# Non-user builds should show detailed build information
BUILD_DISPLAY_ID := $(BUILD_ID)
BUILD_DISPLAY_ID := $(BUILD_DESC)
endif

# TARGET_BUILD_FLAVOR and ro.build.flavor are used only by the test
Expand Down
2 changes: 1 addition & 1 deletion core/version_defaults.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ ifndef PLATFORM_SECURITY_PATCH
# It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
PLATFORM_SECURITY_PATCH := 2022-10-05
PLATFORM_SECURITY_PATCH := 2023-01-05
endif
.KATI_READONLY := PLATFORM_SECURITY_PATCH

Expand Down
3 changes: 1 addition & 2 deletions tools/releasetools/non_ab_ota.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,15 +196,14 @@ def WriteFullOTAPackage(input_zip, output_file):

recovery_img = common.GetBootableImage("recovery.img", "recovery.img",
OPTIONS.input_tmp, "RECOVERY")
common.CheckSize(recovery_img.data, "recovery.img", target_info)
common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data)
if OPTIONS.two_step:
if not target_info.get("multistage_support"):
assert False, "two-step packages not supported by this build"
fs = target_info["fstab"]["/misc"]
assert fs.fs_type.upper() == "EMMC", \
"two-step packages only supported on devices with EMMC /misc partitions"
bcb_dev = {"bcb_dev": fs.device}
common.ZipWriteStr(output_zip, "recovery.img", recovery_img.data)
script.AppendExtra("""
if get_stage("%(bcb_dev)s") == "2/3" then
""" % bcb_dev)
Expand Down