[Q-COMPAT] common: Set PRODUCT_BUILD_RECOVERY_IMAGE=true#633
Merged
Conversation
ix5
force-pushed
the
product-build-recovery
branch
from
cafdcfd to
fefbd68
Compare
jerpelea
force-pushed
the
master
branch
2 times, most recently
from
3cc88ac to
784b86e
Compare
ix5
force-pushed
the
product-build-recovery
branch
from
fefbd68 to
5d4775a
Compare
This is needed to get OTA packaging to work since Android Q since certain OTA parameters are extracted from an intermediate recovery image. Don't as why... On Pie, a recovery image is built by default anyway, so this commit changes nothing on Pie. Relavant: https://r.android.com/951796 Changing: ``` ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) [... build recoveryimage] ``` to: ``` ifeq ($(BOARD_USES_RECOVERY_AS_BOOT),true) BUILDING_RECOVERY_IMAGE := true else ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),) ifdef BOARD_RECOVERYIMAGE_PARTITION_SIZE ifeq (,$(filter true, $(TARGET_NO_KERNEL) $(TARGET_NO_RECOVERY))) BUILDING_RECOVERY_IMAGE := true endif endif else ifeq ($(PRODUCT_BUILD_RECOVERY_IMAGE),true) BUILDING_RECOVERY_IMAGE := true endif [... build recoveryimage] ```
ix5
force-pushed
the
product-build-recovery
branch
from
5d4775a to
60ef542
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is needed to get OTA packaging to work since Android Q since certain OTA parameters are extracted from an intermediate recovery image. Don't as why...
On Pie, a recovery image is built by default anyway, so this commit changes nothing on Pie.
Relavant: https://r.android.com/951796
Changing:
to:
Also, move the treble buildvars in
common.mktogether.