Browse Source

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

The current multi-ko support is achieved by creating, during the
actual build process, target-specific .<chip> symbolic links beneath
the qcacld-3.0 folder. Unfortunately this mechanism violates the
requirements of the Hermetic Build feature which requires that the
source directory not be modified during the build process.

To satisfy this requirement remove the dynamic creation of symbolic
links from Android.mk, and instead staticially instantiate all of the
required symbolic links in the git project.

Change-Id: I7d75bb6a82fd27d8925d53529b4252b782457bc8
CRs-Fixed: 2896976
Jeff Johnson 4 years ago
parent
commit
a07ad750b0
7 changed files with 6 additions and 6 deletions
  1. 1 0
      .qca6390
  2. 1 0
      .qca6490
  3. 1 0
      .qca6750
  4. 1 0
      .wcn6750
  5. 1 0
      .wcn7850
  6. 1 0
      .wlan
  7. 0 6
      Android.mk

+ 1 - 0
.qca6390

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

+ 1 - 0
.qca6490

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

+ 1 - 0
.qca6750

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

+ 1 - 0
.wcn6750

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

+ 1 - 0
.wcn7850

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

+ 1 - 0
.wlan

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

+ 0 - 6
Android.mk

@@ -56,13 +56,7 @@ 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' -exec rm -rf {} +)
 
-$(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