From f7102b858dc849cc94255bc96f95b880dfd93452 Mon Sep 17 00:00:00 2001 From: Fedor917 Date: Thu, 10 Nov 2016 15:53:00 +0700 Subject: Initialising brunch based on davidevinavil device tree (CM14.0 branch) --- Android.mk | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index bbde074..e0ab9cc 100644 --- a/Android.mk +++ b/Android.mk @@ -1,6 +1,3 @@ -# -# Copyright (C) 2016 The CyanogenMod 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 @@ -25,37 +22,20 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),z2_plus) +ifeq ($(TARGET_DEVICE),z2) + +include device/zuk/z2/symlinks.mk include $(call all-makefiles-under,$(LOCAL_PATH)) include $(CLEAR_VARS) -LOCAL_MODULE := wifi_symlinks -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := FAKE -LOCAL_MODULE_SUFFIX := -timestamp - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): ACTUAL_INI_FILE := /system/etc/wifi/WCNSS_qcom_cfg.ini -$(LOCAL_BUILT_MODULE): WCNSS_INI_SYMLINK := $(TARGET_OUT)/etc/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini - -$(LOCAL_BUILT_MODULE): ACTUAL_MAC_FILE := /persist/wlan_mac.bin -$(LOCAL_BUILT_MODULE): WCNSS_MAC_SYMLINK := $(TARGET_OUT)/etc/firmware/wlan/qca_cld/wlan_mac.bin - - -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/Android.mk -$(LOCAL_BUILT_MODULE): - $(hide) echo "Making symlinks for wifi" - $(hide) mkdir -p $(dir $@) - $(hide) mkdir -p $(dir $(WCNSS_INI_SYMLINK)) - $(hide) rm -rf $@ - $(hide) rm -rf $(WCNSS_INI_SYMLINK) - $(hide) ln -sf $(ACTUAL_INI_FILE) $(WCNSS_INI_SYMLINK) - $(hide) rm -rf $(WCNSS_MAC_SYMLINK) - $(hide) ln -sf $(ACTUAL_MAC_FILE) $(WCNSS_MAC_SYMLINK) - $(hide) touch $@ +# END WiFi symlinks +$(shell mkdir -p $(TARGET_OUT_ETC)/firmware/wlan/qca_cld; \ + ln -sf /system/etc/wifi/WCNSS_qcom_cfg.ini \ + $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini; \ + ln -sf /persist/wlan_mac.bin \ + $(TARGET_OUT_ETC)/firmware/wlan/qca_cld/wlan_mac.bin) include $(call all-makefiles-under,$(LOCAL_PATH)) @@ -70,6 +50,4 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) -include device/zuk/z2_plus/tftp.mk - endif -- cgit v1.2.3