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.

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

[Q-COMPAT] common: Set PRODUCT_BUILD_RECOVERY_IMAGE=true #633

Merged
merged 2 commits into from Oct 1, 2019

Conversation

ix5
Copy link
Contributor

@ix5 ix5 commented Aug 11, 2019

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]

Also, move the treble buildvars in common.mk together.

@ix5 ix5 force-pushed the product-build-recovery branch from cafdcfd to fefbd68 Compare Aug 14, 2019
@jerpelea jerpelea force-pushed the master branch 2 times, most recently from 3cc88ac to 784b86e Compare Sep 4, 2019
@ix5 ix5 force-pushed the product-build-recovery branch from fefbd68 to 5d4775a Compare Sep 14, 2019
ix5 added 2 commits Sep 28, 2019
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 ix5 force-pushed the product-build-recovery branch from 5d4775a to 60ef542 Compare Sep 28, 2019
@jerpelea jerpelea merged commit 566bf9a into sonyxperiadev:master Oct 1, 2019
@ix5 ix5 deleted the product-build-recovery branch Oct 1, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants