From 3c77151b46eb2d8e030e630a041575f4c5b64c9a Mon Sep 17 00:00:00 2001 From: Bowgo Tsai Date: Wed, 30 Jun 2021 22:11:09 +0800 Subject: [PATCH] Adding adb_debug.prop into generic_ramdisk.mk After commit I59cd149e0021211b8fd59c44b93bbf18dc8637bf, init_first_stage is no longer installed to the ramdisk when BOARD_USES_RECOVERY_AS_BOOT is True (see b/190974433 for details and init/Android.mk in that commit). adb_debug.prop, which is needed for boot-debug.img, boot-test-harness.img, etc.,will be absent when BOARD_USES_RECOVERY_AS_BOOT is true, because adb_debug.prop is only required by the init_first_stage. Adding adb_debug.prop into generic_ramdisk.mk to include it unconditionally. Bug: 192432810 Test: flash boot-debug.img on a user build, check `adb root` works Change-Id: I234b3430af1b8b09aeb46aef928ca8e16ad452cc --- target/product/generic_ramdisk.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/target/product/generic_ramdisk.mk b/target/product/generic_ramdisk.mk index ae81329c68..80d34bea30 100644 --- a/target/product/generic_ramdisk.mk +++ b/target/product/generic_ramdisk.mk @@ -25,6 +25,7 @@ PRODUCT_PACKAGES += \ # Debug ramdisk PRODUCT_PACKAGES += \ + adb_debug.prop \ userdebug_plat_sepolicy.cil \ _my_paths := \