diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-17 00:11:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-12-17 00:11:36 +0000 |
| commit | 07e2272c9bf111fd377d3f54dae00b0ab68096c0 (patch) | |
| tree | c57573b777e6e763811a8557bd97c15e0c6608b5 | |
| parent | 0054c99b388c3f0e98b25b1f4c4c76c3761e2b83 (diff) | |
| parent | c0b8c9905fbc8df01f50e0345ea2d65f2577e8a6 (diff) | |
| download | cuttlefish-android11-qpr2-release.tar.gz | |
Snap for 7037678 from c0b8c9905fbc8df01f50e0345ea2d65f2577e8a6 to rvc-qpr2-releaseandroid-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android11-qpr2-release
Change-Id: I99c8c7adcdf2edd07626720744d585f4532655b0
| -rw-r--r-- | vsoc_arm64/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | vsoc_x86/BoardConfig.mk | 4 | ||||
| -rw-r--r-- | vsoc_x86_64/BoardConfig.mk | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/vsoc_arm64/BoardConfig.mk b/vsoc_arm64/BoardConfig.mk index 32090f524..6f2fdac65 100644 --- a/vsoc_arm64/BoardConfig.mk +++ b/vsoc_arm64/BoardConfig.mk @@ -32,7 +32,9 @@ TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := cortex-a53 TARGET_TRANSLATE_2ND_ARCH := false -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_kernel/5.4-arm64/*.ko) +ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),) + BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_kernel/5.4-arm64/*.ko) +endif # TODO(b/149410031): temporarily exclude sdcardfs BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out %/sdcardfs.ko,$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES)) diff --git a/vsoc_x86/BoardConfig.mk b/vsoc_x86/BoardConfig.mk index f12dc7015..e73ec0c58 100644 --- a/vsoc_x86/BoardConfig.mk +++ b/vsoc_x86/BoardConfig.mk @@ -31,7 +31,9 @@ TARGET_NATIVE_BRIDGE_CPU_VARIANT := generic TARGET_NATIVE_BRIDGE_ABI := armeabi-v7a armeabi BUILD_BROKEN_DUP_RULES := true -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_kernel/5.4-x86_64/*.ko) +ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),) + BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_kernel/5.4-x86_64/*.ko) +endif # TODO(b/149410031): temporarily exclude sdcardfs BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out %/sdcardfs.ko,$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES)) diff --git a/vsoc_x86_64/BoardConfig.mk b/vsoc_x86_64/BoardConfig.mk index 9c2cbfe79..8bad1883a 100644 --- a/vsoc_x86_64/BoardConfig.mk +++ b/vsoc_x86_64/BoardConfig.mk @@ -41,7 +41,9 @@ TARGET_NATIVE_BRIDGE_2ND_CPU_VARIANT := generic TARGET_NATIVE_BRIDGE_2ND_ABI := armeabi-v7a armeabi BUILD_BROKEN_DUP_RULES := true -BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_kernel/5.4-x86_64/*.ko) +ifeq ($(BOARD_VENDOR_RAMDISK_KERNEL_MODULES),) + BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(wildcard device/google/cuttlefish_kernel/5.4-x86_64/*.ko) +endif # TODO(b/149410031): temporarily exclude sdcardfs BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out %/sdcardfs.ko,$(BOARD_VENDOR_RAMDISK_KERNEL_MODULES)) |