diff options
| -rwxr-xr-x | Android.mk | 42 | ||||
| -rwxr-xr-x | AndroidBoard.mk | 23 | ||||
| -rw-r--r-- | device.mk | 9 | ||||
| -rwxr-xr-x | wifi/WCNSS_qcom_cfg.ini (renamed from WCNSS_qcom_cfg.ini) | 0 | ||||
| -rwxr-xr-x | wifi/p2p_supplicant_overlay.conf (renamed from p2p_supplicant_overlay.conf) | 0 | ||||
| -rwxr-xr-x | wifi/wpa_supplicant_overlay.conf (renamed from wpa_supplicant_overlay.conf) | 0 |
6 files changed, 43 insertions, 31 deletions
@@ -1,4 +1,42 @@ # -# This empty Android.mk file exists to prevent the build system from -# automatically including any other Android.mk files under this directory. +# Copyright (C) 2018 The LineageOS Project # +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This contains the module build definitions for the hardware-specific +# components for this device. +# +# As much as possible, those components should be built unconditionally, +# with device-specific names to avoid collisions, to avoid device-specific +# bitrot and build breakages. Building a component unconditionally does +# *not* include it on all devices, so it is safe even with hardware-specific +# components. + +LOCAL_PATH := $(call my-dir) + +ifeq ($(TARGET_DEVICE),wayne) +include $(call all-makefiles-under,$(LOCAL_PATH)) + +include $(CLEAR_VARS) + +WCNSS_INI_SYMLINK := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini +$(WCNSS_INI_SYMLINK): $(LOCAL_INSTALLED_MODULE) + @echo "WCNSS config ini link: $@" + @mkdir -p $(dir $@) + @rm -rf $@ + $(hide) ln -sf /vendor/etc/wifi/$(notdir $@) $@ + +ALL_DEFAULT_INSTALLED_MODULES += $(WCNSS_INI_SYMLINK) + +endif diff --git a/AndroidBoard.mk b/AndroidBoard.mk index 4cc2258..263548d 100755 --- a/AndroidBoard.mk +++ b/AndroidBoard.mk @@ -61,29 +61,6 @@ LOCAL_SRC_FILES := fstab_non_AB_variant.qcom LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_ETC) include $(BUILD_PREBUILT) -ifeq ($(strip $(BOARD_HAS_QCOM_WLAN)),true) -include $(CLEAR_VARS) -LOCAL_MODULE := wpa_supplicant_overlay.conf -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/wifi -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := p2p_supplicant_overlay.conf -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := ETC -LOCAL_SRC_FILES := $(LOCAL_MODULE) -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/wifi -include $(BUILD_PREBUILT) - -# Create symbolic links for WLAN -$(shell mkdir -p $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld; \ -ln -sf /vendor/etc/wifi/WCNSS_qcom_cfg.ini \ -$(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini) -endif - #Create dsp directory $(shell mkdir -p $(TARGET_OUT_VENDOR)/lib/dsp) @@ -138,12 +138,9 @@ endif # WLAN driver configuration file PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \ - $(LOCAL_PATH)/wifi_concurrency_cfg.txt:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wifi_concurrency_cfg.txt - -PRODUCT_PACKAGES += \ - wpa_supplicant_overlay.conf \ - p2p_supplicant_overlay.conf + $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/WCNSS_qcom_cfg.ini \ + $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ + $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf #ANT+ stack PRODUCT_PACKAGES += \ diff --git a/WCNSS_qcom_cfg.ini b/wifi/WCNSS_qcom_cfg.ini index b411b5e..b411b5e 100755 --- a/WCNSS_qcom_cfg.ini +++ b/wifi/WCNSS_qcom_cfg.ini diff --git a/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf index e484ebe..e484ebe 100755 --- a/p2p_supplicant_overlay.conf +++ b/wifi/p2p_supplicant_overlay.conf diff --git a/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf index e1f530d..e1f530d 100755 --- a/wpa_supplicant_overlay.conf +++ b/wifi/wpa_supplicant_overlay.conf |