Re-enable copying the kernel image to the build output
The appropriate images are specified in vsoc_[x86|arm64]/device.mk
Bug: 112341596
Test: build and ensure the kernel image is copied
Change-Id: I0dbe1a894bc053f76e05c337b4569072310e550c
diff --git a/vsoc_arm64/phone/aosp_cf.mk b/vsoc_arm64/phone/aosp_cf.mk
index af76064..8814694 100644
--- a/vsoc_arm64/phone/aosp_cf.mk
+++ b/vsoc_arm64/phone/aosp_cf.mk
@@ -43,6 +43,7 @@
DEVICE_PACKAGE_OVERLAYS += device/google/cuttlefish/vsoc_arm64/phone/overlay
+$(call inherit-product, device/google/cuttlefish/vsoc_arm64/device.mk)
PRODUCT_NAME := aosp_cf_arm64_phone
PRODUCT_DEVICE := vsoc_arm64
diff --git a/vsoc_x86/phone/aosp_cf.mk b/vsoc_x86/phone/aosp_cf.mk
index e06aa2c..a1b3973 100644
--- a/vsoc_x86/phone/aosp_cf.mk
+++ b/vsoc_x86/phone/aosp_cf.mk
@@ -38,6 +38,7 @@
DEVICE_PACKAGE_OVERLAYS += device/google/cuttlefish/vsoc_x86/phone/overlay
+$(call inherit-product, device/google/cuttlefish/vsoc_x86/device.mk)
PRODUCT_NAME := aosp_cf_x86_phone
PRODUCT_DEVICE := vsoc_x86