Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92ac1ab authored by Bruno Martins's avatar Bruno Martins Committed by Bharath
Browse files

FP3: Convert WiFi firmware symlink to install_symlink target 

The last bit that was preventing building hermetic images.

Change-Id: I75bb7de4593a7992f6015317cf97e088beeba0cb
parent 6e23eee2

Android.bp

+14 −0
Original line number Diff line number Diff line 
soong_namespace {

    imports: ["hardware/qcom/bootctrl"],

}



install_symlink {

    name: "firmware_WCNSS_qcom_cfg.ini_symlink",

    vendor: true,

    installed_location: "firmware/wlan/prima/WCNSS_qcom_cfg.ini",

    symlink_target: "/vendor/etc/wifi/WCNSS_qcom_cfg.ini",

}



install_symlink {

    name: "firmware_WCNSS_wlan_dictionary.dat_symlink",

    vendor: true,

    installed_location: "firmware/wlan/prima/WCNSS_wlan_dictionary.dat",

    symlink_target: "/vendor/etc/wifi/WCNSS_wlan_dictionary.dat",

}

Android.mk

+0 −10
Original line number Diff line number Diff line
@@ -30,16 +30,6 @@ include $(call all-subdir-makefiles,$(LOCAL_PATH)) 


include $(CLEAR_VARS)



WIFI_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/prima/

$(WIFI_SYMLINKS): $(LOCAL_INSTALLED_MODULE)

	@echo "Creating WCNSS Symlinks: $@"

	@rm -rf $@/*

	@mkdir -p $(dir $@)

	$(hide) ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini

	$(hide) ln -sf /vendor/etc/wifi/WCNSS_wlan_dictionary.dat $@/WCNSS_wlan_dictionary.dat



ALL_DEFAULT_INSTALLED_MODULES += $(WIFI_SYMLINKS)



#A/B builds require us to create the mount points at compile time.

#Just creating it for all cases since it does not hurt.

FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt

device.mk

+5 −0
Original line number Diff line number Diff line
@@ -726,6 +726,11 @@ PRODUCT_PACKAGES += \ 
    wpa_supplicant \

    wpa_supplicant.conf



# Wifi firmware symlinks

PRODUCT_PACKAGES += \

    firmware_WCNSS_qcom_cfg.ini_symlink \

    firmware_WCNSS_wlan_dictionary.dat_symlink



# Wifi

PRODUCT_COPY_FILES += \

    $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \