diff --git a/Android.mk b/Android.mk
index 67b0366..fa59ad3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,8 @@
 LOCAL_PATH:= $(call my-dir)
 LOCAL_DIR_PATH:= $(call my-dir)
 
+LOCAL_PRODUCT_MODULE := true
+
 include $(LOCAL_PATH)/jni/Android.mk
 LOCAL_PATH := $(LOCAL_DIR_PATH)
 include $(LOCAL_PATH)/fmapp2/Android.mk
diff --git a/fm_hci/Android.mk b/fm_hci/Android.mk
index 540ac73..18e60b8 100644
--- a/fm_hci/Android.mk
+++ b/fm_hci/Android.mk
@@ -23,5 +23,6 @@
 LOCAL_MODULE := libfm-hci
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_PRODUCT_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
index d6c206b..d96a2f8 100644
--- a/fmapp2/Android.mk
+++ b/fmapp2/Android.mk
@@ -32,6 +32,7 @@
 LOCAL_JAVA_LIBRARIES := qcom.fmradio
 LOCAL_PRIVATE_PLATFORM_APIS := true
 LOCAL_AAPT_FLAGS += --legacy
+LOCAL_PRODUCT_MODULE := true
 include $(BUILD_PACKAGE)
 
 endif
diff --git a/helium/Android.mk b/helium/Android.mk
index 737ed3f..868607e 100644
--- a/helium/Android.mk
+++ b/helium/Android.mk
@@ -18,5 +18,6 @@
 
 LOCAL_MODULE := fm_helium
 LOCAL_MODULE_TAGS := optional
+LOCAL_PRODUCT_MODULE := true
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/Android.mk b/jni/Android.mk
index e917f32..a3da551 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -3,6 +3,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_PRODUCT_MODULE := true
 LOCAL_SRC_FILES:= \
 android_hardware_fm.cpp \
 ConfFileParser.cpp \
@@ -28,6 +29,5 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-
 endif # is-vendor-board-platform
 endif # BOARD_HAVE_QCOM_FM