From 11892a4b9aa50a79803082ba2aa3bdf54b925681 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Fri, 19 Oct 2018 16:40:33 +0800 Subject: [PATCH] Workaround Legancy GSI for some Wifi firmware Bug: 117963911 Test: Turn on wifi with aosp_arm64_ab-userdebug on Pixel 1/2/3 devices Change-Id: I0d516876522a687709ff21cbfc5bc0cc415b8335 --- target/board/generic_arm64/BoardConfig.mk | 2 +- target/board/generic_arm64_ab/BoardConfig.mk | 4 +++- target/board/generic_arm_ab/BoardConfig.mk | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/target/board/generic_arm64/BoardConfig.mk b/target/board/generic_arm64/BoardConfig.mk index c1983ad465..13d5bd64af 100644 --- a/target/board/generic_arm64/BoardConfig.mk +++ b/target/board/generic_arm64/BoardConfig.mk @@ -61,7 +61,7 @@ BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 # cleaned up all device specific directories under root! # TODO(b/111434759, b/111287060) SoC specific hacks -BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk index fc6b58284b..88b90a8fbf 100644 --- a/target/board/generic_arm64_ab/BoardConfig.mk +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -34,7 +34,9 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true # TODO(jiyong) These might be SoC specific. BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist -BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo # Set this to create /cache mount point for non-A/B devices that mounts /cache. # The partition size doesn't matter, just to make build pass. diff --git a/target/board/generic_arm_ab/BoardConfig.mk b/target/board/generic_arm_ab/BoardConfig.mk index 7d9ea9c0e5..3d14842901 100644 --- a/target/board/generic_arm_ab/BoardConfig.mk +++ b/target/board/generic_arm_ab/BoardConfig.mk @@ -28,7 +28,9 @@ BOARD_BUILD_SYSTEM_ROOT_IMAGE := true # TODO(jiyong) These might be SoC specific. BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist -BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo # Set this to create /cache mount point for non-A/B devices that mounts /cache. # The partition size doesn't matter, just to make build pass.