commit 1065523a5e668c22601bf5f4608d4ff8d64e9ec3
author Ramji Jiyani <ramjiyani@google.com> Thu Jan 20 06:43:09 2022 +0000
committer Ramji Jiyani <ramjiyani@google.com> Fri Jan 21 21:39:15 2022 +0000
tree 6dcbb4942158bc089406e5caab1755376c9e7379
parent 95ec3b899e2493a4872e23306715f9a7f1ab89cc

Add support to build system_dlkm.img

There are 2 choices to build system_dlkm.img for
the system_dlkm partition for Android T launch
devices and must choose one.

1. Use kernel prebuilt system_dlkm.img
   - BOARD_PREBUILT_SYSTEM_DLKM_IMAGE to point image
2. Build from kernel prebuilt system_dlkm_staging
   - PRODUCT_BUILD_SYSTEM_DLKM_IMAGE

Both requires: BOARD_SYSTEM_DLKM_PARTITION_SIZE and
must be 64MB or higher in size (enforced via vts).

Bug: 200082547
Test: TH
Test: atest vts_system_dlkm_partition_test
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I83435123bd8aa3d04ab8a8b650a95fbab0bc49f2

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 56007e2..986cbc3 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -1606,6 +1606,9 @@
 .PHONY: initbootimage
 bootimage: $(INSTALLED_INIT_BOOT_IMAGE_TARGET)
 
+.PHONY: system_dlkm_image
+system_dlkm_image: $(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET)
+
 ifeq (true,$(PRODUCT_EXPORT_BOOT_IMAGE_TO_DIST))
 $(call dist-for-goals, bootimage, $(INSTALLED_BOOTIMAGE_TARGET))
 endif
@@ -1630,6 +1633,7 @@
 .PHONY: droidcore-unbundled
 droidcore-unbundled: $(filter $(HOST_OUT_ROOT)/%,$(modules_to_install)) \
     $(INSTALLED_SYSTEMIMAGE_TARGET) \
+    $(INSTALLED_SYSTEM_DLKM_IMAGE_TARGET) \
     $(INSTALLED_RAMDISK_TARGET) \
     $(INSTALLED_BOOTIMAGE_TARGET) \
     $(INSTALLED_INIT_BOOT_IMAGE_TARGET) \