Merge "Cleanup in emulator_arm64/device.mk" am: aa1f970711 am: 40e233c6ba

Original change: https://android-review.googlesource.com/c/platform/build/+/2548555

Change-Id: I5835f177be5be2e139758c083d05df46872c66dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roman Kiryanov
2023-04-20 07:17:54 +00:00
committed by Automerger Merge Worker

View File

@@ -17,12 +17,3 @@
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu PRODUCT_SOONG_NAMESPACES += device/generic/goldfish # for libwifi-hal-emu
PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps. PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
# Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img.
ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := kernel/prebuilts/5.4/arm64/kernel-5.4-lz4
else
LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
endif
PRODUCT_COPY_FILES += \
$(LOCAL_KERNEL):kernel