StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "use new GKI kernel location" am: 1d83969db8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1455075

Change-Id: I9c5af9cf064f3672e51736f2194b834162f3d993
This commit is contained in:
Steve Muckle
2020-10-09 06:05:16 +00:00
committed by Automerger Merge Worker
parent 871d07c67d 1d83969db8
commit b3f99cd4cd
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/board/emulator_arm64/device.mk
View File

@@ -19,7 +19,7 @@ PRODUCT_SOONG_NAMESPACES += device/generic/goldfish-opengl # for goldfish deps.
# Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img. # Cuttlefish has GKI kernel prebuilts, so use those for the GKI boot.img.
ifeq ($(TARGET_PREBUILT_KERNEL),) ifeq ($(TARGET_PREBUILT_KERNEL),)
LOCAL_KERNEL := device/google/cuttlefish_kernel/5.4-arm64/kernel LOCAL_KERNEL := kernel/prebuilts/5.4/arm64/kernel-5.4
else else
LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)
endif endif

18
target/board/generic_arm64/device.mk
View File

@@ -16,16 +16,16 @@
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
kernel/prebuilts/4.19/arm64/Image.gz:kernel-4.19-gz \ kernel/prebuilts/4.19/arm64/Image.gz:kernel-4.19-gz \
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4 \ kernel/prebuilts/5.4/arm64/kernel-5.4:kernel-5.4 \
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz \ kernel/prebuilts/5.4/arm64/kernel-5.4-gz:kernel-5.4-gz \
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4 \ kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-lz4 \
kernel/prebuilts/mainline/arm64/kernel-mainline:kernel-mainline \ kernel/prebuilts/mainline/arm64/kernel-mainline-allsyms:kernel-mainline \
kernel/prebuilts/mainline/arm64/kernel-mainline-gz:kernel-mainline-gz \ kernel/prebuilts/mainline/arm64/kernel-mainline-gz-allsyms:kernel-mainline-gz \
kernel/prebuilts/mainline/arm64/kernel-mainline-lz4:kernel-mainline-lz4 kernel/prebuilts/mainline/arm64/kernel-mainline-lz4-allsyms:kernel-mainline-lz4
ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4:kernel-5.4-allsyms \ kernel/prebuilts/5.4/arm64/kernel-5.4:kernel-5.4-allsyms \
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-gz:kernel-5.4-gz-allsyms \ kernel/prebuilts/5.4/arm64/kernel-5.4-gz:kernel-5.4-gz-allsyms \
device/google/cuttlefish_kernel/5.4-arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms kernel/prebuilts/5.4/arm64/kernel-5.4-lz4:kernel-5.4-lz4-allsyms
endif endif