samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: hide temp dirs generated during compilation

Browse Source 
To build multiple ko files, android build system will
generate some temporary dirs, names of wihch are started
with '~'.
Replace these '~' with '.' to hide the temporary dirs.

CRs-Fixed: 2522153
Change-Id: Ic2606afee07c068803fd9b0446d20851e1e06e03
This commit is contained in:
Yu Wang
2019-09-04 20:09:06 +08:00
committed by nshrivas
parent baff800e4d
commit 8cf2c24edb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Android.mk
View File

@@ -23,9 +23,8 @@ ifneq ($(findstring opensource,$(LOCAL_PATH)),)
endif # opensource endif # opensource
# Multi-ko check # Multi-ko check
LOCAL_DEV_NAME := $(lastword $(strip \ LOCAL_DEV_NAME := $(patsubst .%,%,\
$(subst ~, , \ $(lastword $(strip $(subst /, ,$(LOCAL_PATH)))))
$(subst /, ,$(LOCAL_PATH)))))
ifeq (1, $(strip $(shell expr $(words $(strip $(TARGET_WLAN_CHIP))) \>= 2))) ifeq (1, $(strip $(shell expr $(words $(strip $(TARGET_WLAN_CHIP))) \>= 2)))
@@ -40,21 +39,22 @@ endif
ifeq ($(LOCAL_MULTI_KO), true) ifeq ($(LOCAL_MULTI_KO), true)
LOCAL_ANDROID_ROOT := $(shell pwd) LOCAL_ANDROID_ROOT := $(shell pwd)
LOCAL_WLAN_BLD_DIR := $(LOCAL_ANDROID_ROOT)/$(WLAN_BLD_DIR) LOCAL_WLAN_BLD_DIR := $(LOCAL_ANDROID_ROOT)/$(WLAN_BLD_DIR)
$(shell rm -rf $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/~*) $(shell find $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/ -maxdepth 1 \
-name '.*' ! -name '.git' -exec rm -rf {} +)
$(foreach chip, $(TARGET_WLAN_CHIP), \ $(foreach chip, $(TARGET_WLAN_CHIP), \
$($(shell mkdir -p $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/~$(chip); \ $($(shell mkdir -p $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/.$(chip); \
ln -sf $(LOCAL_WLAN_BLD_DIR)/qca-wifi-host-cmn \ ln -sf $(LOCAL_WLAN_BLD_DIR)/qca-wifi-host-cmn \
$(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/~$(chip)/qca-wifi-host-cmn); \ $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/.$(chip)/qca-wifi-host-cmn); \
$(foreach node, \ $(foreach node, \
$(shell find $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/ -maxdepth 1 \ $(shell find $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/ -maxdepth 1 \
! -name '.*' ! -name '~*' ! -name '*~' \ ! -name '.*' ! -name '*~' \
! -name '.' ! -name 'qcacld-3.0'), \ ! -name '.' ! -name 'qcacld-3.0'), \
$(shell ln -sf $(node) \ $(shell ln -sf $(node) \
$(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/~$(chip)/$(lastword $(strip $(subst /, ,$(node)))) \ $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/.$(chip)/$(lastword $(strip $(subst /, ,$(node)))) \
)))) ))))
include $(foreach chip, $(TARGET_WLAN_CHIP), $(LOCAL_PATH)/~$(chip)/Android.mk) include $(foreach chip, $(TARGET_WLAN_CHIP), $(LOCAL_PATH)/.$(chip)/Android.mk)
else # Multi-ok check else # Multi-ok check
@@ -71,7 +71,7 @@ TARGET_MAC_BIN_PATH := /mnt/vendor/persist
else else
LOCAL_SRC_DIR := ~$(LOCAL_DEV_NAME) LOCAL_SRC_DIR := .$(LOCAL_DEV_NAME)
CMN_OFFSET := . CMN_OFFSET := .
WLAN_PROFILE := $(LOCAL_DEV_NAME) WLAN_PROFILE := $(LOCAL_DEV_NAME)
TARGET_FW_DIR := firmware/wlan/qca_cld/$(LOCAL_DEV_NAME) TARGET_FW_DIR := firmware/wlan/qca_cld/$(LOCAL_DEV_NAME)