diff --git a/proprietary-files.txt b/proprietary-files.txt index 19bbf65..275a030 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -927,7 +927,7 @@ system_ext/lib64/vendor.qti.hardware.dpmservice@1.0.so system_ext/priv-app/dpmserviceapp/dpmserviceapp.apk vendor/bin/dpmQmiMgr vendor/etc/init/dpmQmiMgr.rc -vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so +vendor/lib64/com.qualcomm.qti.dpm.api@1.0.so;MODULE=com.qualcomm.qti.dpm.api@1.0-vendor vendor/lib64/libdpmqmihal.so # DRM diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 397579f..d9cfd36 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -36,7 +36,28 @@ function vendor_imports() { EOF } -# Initialize the helper +function lib_to_package_fixup_vendor_variants() { + if [ "$2" != "vendor" ]; then + return 1 + fi + + case "$1" in + com.qualcomm.qti.dpm.api@1.0) + echo "$1-vendor" + ;; + *) + return 1 + ;; + esac +} + +function lib_to_package_fixup() { + lib_to_package_fixup_clang_rt_ubsan_standalone "$1" || + lib_to_package_fixup_proto_3_9_1 "$1" || + lib_to_package_fixup_vendor_variants "$@" +} + +# Initialize the helper for common setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" # Warning headers and guards