FP5: Mark CNE symlink target as required package
Change-Id: I0bfe65ba61b6aa9916fe6459be2a84d772939a2f
diff --git a/Android.mk b/Android.mk
index f1b7c24..1408470 100644
--- a/Android.mk
+++ b/Android.mk
@@ -36,19 +36,11 @@
@mkdir -p $(dir $@)
$(hide) ln -sf /mnt/vendor/persist/factory/audio/aw_cali.bin $@
-CNE_LIBS := libvndfwk_detect_jni.qti.so
-CNE_SYMLINKS := $(addprefix $(TARGET_OUT_VENDOR_APPS)/CneApp/lib/arm64/,$(notdir $(CNE_LIBS)))
-$(CNE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
- @echo "CNE lib link: $@"
- @mkdir -p $(dir $@)
- @rm -rf $@
- $(hide) ln -sf /vendor/lib64/$(notdir $@) $@
-
WIFI_FIRMWARE_SYMLINKS := $(TARGET_OUT_VENDOR)/firmware/wlan/qca_cld
$(WIFI_FIRMWARE_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
@echo "Creating wifi firmware symlinks: $@"
@mkdir -p $@
$(hide) ln -sf /vendor/etc/wifi/qca6750/WCNSS_qcom_cfg.ini $@/WCNSS_qcom_cfg.ini
-ALL_DEFAULT_INSTALLED_MODULES += $(AW882XX_CAL_SYMLINKS) $(CNE_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS)
+ALL_DEFAULT_INSTALLED_MODULES += $(AW882XX_CAL_SYMLINKS) $(WIFI_FIRMWARE_SYMLINKS)
endif
diff --git a/proprietary-files.txt b/proprietary-files.txt
index f91c51f..2944a0b 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -378,7 +378,7 @@
vendor/etc/init/vendor.qti.hardware.charger_monitor@1.0-service.rc
# CNE
-vendor/app/CneApp/CneApp.apk
+vendor/app/CneApp/CneApp.apk;REQUIRED=CneApp.libvndfwk_detect_jni.qti_symlink
vendor/bin/cnd
vendor/bin/mutualex
vendor/etc/cne/mwqem.conf