diff --git a/aosp/vendor/common/prebuild/Android.mk b/aosp/vendor/common/prebuild/Android.mk
index 40aac83b41d21b69a32300ac740e150d4bcc4a33..1c33dd4550df848c28ec35f4367c3832e00be45f 100644
--- a/aosp/vendor/common/prebuild/Android.mk
+++ b/aosp/vendor/common/prebuild/Android.mk
@@ -70,13 +70,10 @@ $(foreach lib, $(cme_libs), \
             $(VA_MULTILIB)))))
 endif
 
-hal_libs =
-ifeq ($(CONFIG_ENABLE_HW_SENSOR),y)
-hal_libs += sensors.default
-endif
 
 ifeq ($(CONFIG_ENABLE_HW_AUDIO),y)
-hal_libs += audio.primary.default
+hal_libs = \
+audio.primary.default
 endif
 
 $(foreach lib, $(hal_libs), \
@@ -101,4 +98,19 @@ LOCAL_MODULE := appctrl
 LOCAL_SRC_FILES := system/bin/appctrl
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_CHECK_ELF_FILES := false
-include $(BUILD_PREBUILT)
\ No newline at end of file
+include $(BUILD_PREBUILT)
+
+ifeq ($(CONFIG_ENABLE_HW_SENSOR),y)
+include $(CLEAR_VARS)
+LOCAL_MODULE := sensors.default
+LOCAL_VENDOR_MODULE := true
+LOCAL_MODULE_RELATIVE_PATH := hw
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MULTILIB := both
+LOCAL_CHECK_ELF_FILES := false
+LOCAL_SRC_FILES_arm64 := system/vendor/lib64/hw/$(LOCAL_MODULE).so
+LOCAL_SRC_FILES_arm := system/vendor/lib/hw/$(LOCAL_MODULE).so
+LOCAL_SHARED_LIBRARIES := libc++ libc libcutils libdl libevent liblog libm libqemud.ranchu libsqlite libbase
+include $(BUILD_PREBUILT)
+endif
\ No newline at end of file