diff --git a/Android.mk b/Android.mk index b3be126..ae60f1b 100644 --- a/Android.mk +++ b/Android.mk @@ -28,14 +28,6 @@ LOCAL_PATH := $(call my-dir) ifneq (,$(filter $(TARGET_DEVICE),ripcurrent husky shiba)) include $(call all-makefiles-under,$(LOCAL_PATH)) -DM_LIBS := libdmengine.so libdmjavaplugin.so -DM_SYMLINKS := $(addprefix $(TARGET_OUT_PRODUCT)/priv-app/DMService/lib/arm64/,$(notdir $(DM_LIBS))) -$(DM_SYMLINKS): $(LOCAL_INSTALLED_MODULE) - @echo "DMService lib link: $@" - @mkdir -p $(dir $@) - @rm -rf $@ - $(hide) ln -sf /product/lib64/$(notdir $@) $@ - DISPLAY_LIBS := libpixeldisplaymanager_jni.so DISPLAY_SYMLINKS := $(addprefix $(TARGET_OUT_SYSTEM_EXT)/priv-app/PixelDisplayService/lib/arm64/,$(notdir $(DISPLAY_LIBS))) $(DISPLAY_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @@ -44,5 +36,5 @@ $(DISPLAY_SYMLINKS): $(LOCAL_INSTALLED_MODULE) @rm -rf $@ $(hide) ln -sf /system_ext/lib64/$(notdir $@) $@ -ALL_DEFAULT_INSTALLED_MODULES += $(DM_SYMLINKS) $(DISPLAY_SYMLINKS) +ALL_DEFAULT_INSTALLED_MODULES += $(DISPLAY_SYMLINKS) endif diff --git a/husky/proprietary-files.txt b/husky/proprietary-files.txt index 90c0ed1..61cd990 100644 --- a/husky/proprietary-files.txt +++ b/husky/proprietary-files.txt @@ -57,8 +57,8 @@ product/etc/sysconfig/pixel_experience_2023_midyear.xml product/etc/permissions/com.android.sdm.plugins.connmo.xml product/etc/permissions/com.android.sdm.plugins.dcmo.xml product/etc/permissions/com.android.sdm.plugins.diagmon.xml -product/lib64/libdmengine.so -product/lib64/libdmjavaplugin.so +product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so +product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED product/priv-app/ConnMO/ConnMO.apk diff --git a/shiba/proprietary-files.txt b/shiba/proprietary-files.txt index bc105cd..12b1a9a 100644 --- a/shiba/proprietary-files.txt +++ b/shiba/proprietary-files.txt @@ -57,8 +57,8 @@ product/etc/sysconfig/pixel_experience_2023_midyear.xml product/etc/permissions/com.android.sdm.plugins.connmo.xml product/etc/permissions/com.android.sdm.plugins.dcmo.xml product/etc/permissions/com.android.sdm.plugins.diagmon.xml -product/lib64/libdmengine.so -product/lib64/libdmjavaplugin.so +product/lib64/libdmengine.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmengine.so +product/lib64/libdmjavaplugin.so;SYMLINK=product/priv-app/DMService/lib/arm64/libdmjavaplugin.so product/priv-app/CarrierSettings_signed_45.0.591154042/CarrierSettings_signed_45.0.591154042.apk;PRESIGNED product/priv-app/CarrierWifi/CarrierWifi.apk;PRESIGNED product/priv-app/ConnMO/ConnMO.apk