Просмотр исходного кода

qcacld-3.0: Use dynamic symbolic links for multi-ko support

This reverts Change-Id I7d75bb6a82fd27d8925d53529b4252b782457bc8
("qcacld-3.0: Use static symbolic links for multi-ko support") along
with removing per-chipset symbolic links added after that patch.

The original patch was created to allow the qcacld-3.0 driver to
conform to the Hermetic Build feature which required that the source
directory not be modified during the build process. However,
qcacld-3.0 is transitioning to the Bazel DDK, and the presence of the
symbolic links is interfering with Bazel. In addition, the Bazel
build system won't use these symbolic links. So the support both the
legacy build system (in a non-hermetic manner) as well as the Bazel
DDK (in a hermetic manner), revert back to dynamically creating the
symbolic links.

Change-Id: I2b6a0ed19f7f4b3ae31d28e2b4683afd0671f19a
CRs-Fixed: 3495618
Jeff Johnson 1 год назад
Родитель
Сommit
6bff3d33e3
16 измененных файлов с 6 добавлено и 15 удалено
  1. 0 1
      .adrastea
  2. 0 1
      .kiwi
  3. 0 1
      .kiwi_v2
  4. 0 1
      .mango
  5. 0 1
      .peach
  6. 0 1
      .qca6174
  7. 0 1
      .qca6390
  8. 0 1
      .qca6390_cnss2
  9. 0 1
      .qca6490
  10. 0 1
      .qca6490_cnss2
  11. 0 1
      .qca6750
  12. 0 1
      .qcn7605
  13. 0 1
      .wcn6450
  14. 0 1
      .wcn6750
  15. 0 1
      .wlan
  16. 6 0
      Android.mk

+ 0 - 1
.adrastea

@@ -1 +0,0 @@
-.

+ 0 - 1
.kiwi

@@ -1 +0,0 @@
-.

+ 0 - 1
.kiwi_v2

@@ -1 +0,0 @@
-.

+ 0 - 1
.mango

@@ -1 +0,0 @@
-.

+ 0 - 1
.peach

@@ -1 +0,0 @@
-.

+ 0 - 1
.qca6174

@@ -1 +0,0 @@
-.

+ 0 - 1
.qca6390

@@ -1 +0,0 @@
-.

+ 0 - 1
.qca6390_cnss2

@@ -1 +0,0 @@
-.

+ 0 - 1
.qca6490

@@ -1 +0,0 @@
-.

+ 0 - 1
.qca6490_cnss2

@@ -1 +0,0 @@
-.

+ 0 - 1
.qca6750

@@ -1 +0,0 @@
-.

+ 0 - 1
.qcn7605

@@ -1 +0,0 @@
-.

+ 0 - 1
.wcn6450

@@ -1 +0,0 @@
-./

+ 0 - 1
.wcn6750

@@ -1 +0,0 @@
-.

+ 0 - 1
.wlan

@@ -1 +0,0 @@
-.

+ 6 - 0
Android.mk

@@ -68,7 +68,13 @@ endif
 endif
 
 ifeq ($(LOCAL_MULTI_KO), true)
+LOCAL_ANDROID_ROOT := $(shell pwd)
+LOCAL_WLAN_BLD_DIR := $(LOCAL_ANDROID_ROOT)/$(WLAN_BLD_DIR)
+$(shell find $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/ -maxdepth 1 \
+	-name '.*' ! -name '.git' -delete {} +)
 
+$(foreach chip, $(TARGET_WLAN_CHIP), \
+	$(shell ln -sf . $(LOCAL_WLAN_BLD_DIR)/qcacld-3.0/.$(chip)))
 include $(foreach chip, $(TARGET_WLAN_CHIP), $(LOCAL_PATH)/.$(chip)/Android.mk)
 
 else # Multi-ok check