From e20953eccb7d8b9125a37699b2cef2c8374fa3f0 Mon Sep 17 00:00:00 2001 From: Fedor917 Date: Thu, 10 Nov 2016 16:06:27 +0700 Subject: Change device name and small edits --- Android.mk | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index e0ab9cc..bbde074 100644 --- a/Android.mk +++ b/Android.mk @@ -1,3 +1,6 @@ +# +# 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 @@ -22,20 +25,37 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),z2) - -include device/zuk/z2/symlinks.mk +ifeq ($(TARGET_DEVICE),z2_plus) include $(call all-makefiles-under,$(LOCAL_PATH)) include $(CLEAR_VARS) -# 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) +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 $@ include $(call all-makefiles-under,$(LOCAL_PATH)) @@ -50,4 +70,6 @@ $(IMS_SYMLINKS): $(LOCAL_INSTALLED_MODULE) ALL_DEFAULT_INSTALLED_MODULES += $(IMS_SYMLINKS) +include device/zuk/z2_plus/tftp.mk + endif -- cgit v1.2.3