Remove usage of intermediates-dir-for am: 4293b68380 am: 4449d053d5

Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2042723

Change-Id: I32a1757d9e9bab23dcd3741c924c1b9907b29692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Cole Faust 2022-03-25 18:18:42 +00:00 committed by Automerger Merge Worker
commit fe6f545c69

View file

@ -68,12 +68,7 @@ TARGET_RECOVERY_WIPE := device/google/gs101/conf/recovery.wipe
# This is the fstab file that will be included in the recovery image. Note that # This is the fstab file that will be included in the recovery image. Note that
# recovery doesn't care about the encryption settings, so it doesn't matter # recovery doesn't care about the encryption settings, so it doesn't matter
# whether we use the normal or the fips fstab here. # whether we use the normal or the fips fstab here.
# TARGET_RECOVERY_FSTAB_GENRULE = gen_fstab.gs101
# Since this is a generated file, it's necessary to use intermediates-dir-for in
# order to refer to it correctly. And since intermediates-dir-for isn't defined
# yet when this file is included, it's necessary to use a deferred variable
# assignment ( = ) rather than an immediate variable assignment ( := ).
TARGET_RECOVERY_FSTAB = $(call intermediates-dir-for,ETC,fstab.gs101)/fstab.gs101
TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888 TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165 TARGET_RECOVERY_UI_MARGIN_HEIGHT := 165