From 78d5bbca1d4a4c86d34aa4e990a1d12d6ffe61d1 Mon Sep 17 00:00:00 2001 From: dianlujitao Date: Wed, 3 Oct 2018 17:03:41 +0800 Subject: [PATCH] wayne-common: Create mount point symlinks for backward compatibility Change-Id: I63cdc49ea94447804c6b336d3e509b1f7967b174 --- Android.mk | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Android.mk b/Android.mk index 5336e861..ae5df532 100644 --- a/Android.mk +++ b/Android.mk @@ -49,6 +49,37 @@ $(LOCAL_BUILT_MODULE): $(hide) ln -sf $(ACTUAL_BIN_FILE) $(WCNSS_BIN_SYMLINK) $(hide) touch $@ +# A/B builds require us to create the mount points at compile time. +# Just creating it for all cases since it does not hurt. +FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/firmware_mnt +BT_FIRMWARE_MOUNT_POINT := $(TARGET_OUT_VENDOR)/bt_firmware +DSP_MOUNT_POINT := $(TARGET_OUT_VENDOR)/dsp +PERSIST_MOUNT_POINT := $(TARGET_ROOT_OUT)/persist +$(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 +$(PERSIST_MOUNT_POINT): + @echo "Creating $(PERSIST_MOUNT_POINT)" +ifneq ($(TARGET_MOUNT_POINTS_SYMLINKS),false) + @ln -sf /mnt/vendor/persist $(TARGET_ROOT_OUT)/persist +endif +ALL_DEFAULT_INSTALLED_MODULES += $(FIRMWARE_MOUNT_POINT) $(BT_FIRMWARE_MOUNT_POINT) $(DSP_MOUNT_POINT) $(PERSIST_MOUNT_POINT) + IMS_LIBS := libimscamera_jni.so libimsmedia_jni.so IMS_SYMLINKS := $(addprefix $(TARGET_OUT_APPS)/ims/lib/arm64/,$(notdir $(IMS_LIBS)))