Commit eabe7432 authored Dec 10, 2024 by Jihoon Kang

Do not install Android.bp file in recovery partition

https://r.android.com/3390999 accidentally led to the Android.bp file
being installed in the recovery partition. This change modifies the make
logic to ensure that the make generated recovery partition does not
install the Android.bp file.

Test: aninja -t query out/target/product/vsoc_x86_64/obj/PACKAGING/recovery_intermediates/ramdisk_files-timestamp && verify Android.bp is not included
Bug: 381888358
Change-Id: I29e74b6816cbec7cc44c7a9cc4a9330f7f4c4018

parent 713daec0

core/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -2664,7 +2664,7 @@ ifndef TARGET_PRIVATE_RES_DIRS
		TARGET_PRIVATE_RES_DIRS := $(wildcard $(TARGET_DEVICE_DIR)/recovery/res)
		endif
		recovery_resource_deps := $(shell find $(recovery_resources_common) \
		$(TARGET_PRIVATE_RES_DIRS) -type f)
		$(TARGET_PRIVATE_RES_DIRS) -type f -not -name "*.bp")
		recovery_resource_deps += $(generated_recovery_text_files)