summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Martins <bgcngm@gmail.com>2018-11-10 16:52:07 +0000
committerTingyiChen <tingyi364@gmail.com>2019-08-13 11:52:50 +0200
commitd8899fc8a6ea5aa8b9126a4c191fbd9e289f7644 (patch)
tree18456cf44077ec3ea4906b8b469eb55bafcb99b3
parentedf6b1d8bff72cd64b15eb522368b690a2500345 (diff)
wayne-common: Use build system to create mount point symlinks
Change-Id: I2672d6cd1b644c7ba9068a563755de6fde27bc57
-rw-r--r--Android.mk11
-rw-r--r--BoardConfigCommon.mk5
2 files changed, 7 insertions, 9 deletions
diff --git a/Android.mk b/Android.mk
index 55ed1fe..f192312 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,21 +58,14 @@ DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp
$(FIRMWARE_MOUNT_POINT):
@echo "Creating $(FIRMWARE_MOUNT_POINT)"
@mkdir -p $(TARGET_OUT_VENDOR)/firmware_mnt
-ifneq ($(TARGET_MOUNT_POINTS_SYMLINKS),false)
- @ln -sf /vendor/firmware_mnt $(TARGET_ROOT_OUT)/firmware
-endif
+
$(BT_FIRMWARE_MOUNT_POINT):
@echo "Creating $(BT_FIRMWARE_MOUNT_POINT)"
@mkdir -p $(TARGET_OUT_VENDOR)/bt_firmware
-ifneq ($(TARGET_MOUNT_POINTS_SYMLINKS),false)
- @ln -sf /vendor/bt_firmware $(TARGET_ROOT_OUT)/bt_firmware
-endif
+
$(DSP_MOUNT_POINT):
@echo "Creating $(DSP_MOUNT_POINT)"
@mkdir -p $(TARGET_OUT_VENDOR)/dsp
-ifneq ($(TARGET_MOUNT_POINTS_SYMLINKS),false)
- @ln -sf /vendor/dsp $(TARGET_ROOT_OUT)/dsp
-endif
ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT)
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk
index 43c0298..0b25296 100644
--- a/BoardConfigCommon.mk
+++ b/BoardConfigCommon.mk
@@ -209,6 +209,11 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
TARGET_EXFAT_DRIVER := exfat
+BOARD_ROOT_EXTRA_SYMLINKS := \
+ /vendor/dsp:/dsp \
+ /vendor/firmware_mnt:/firmware \
+ /vendor/bt_firmware:/bt_firmware
+
TARGET_COPY_OUT_VENDOR := vendor
TARGET_USERIMAGES_USE_EXT4 := true