diff --git a/libqdutils/Android.mk b/libqdutils/Android.mk
index 2177606..218371f 100644
--- a/libqdutils/Android.mk
+++ b/libqdutils/Android.mk
@@ -13,7 +13,6 @@ LOCAL_SRC_FILES               := profiler.cpp mdp_version.cpp \
                                  comptype.cpp
 include $(BUILD_SHARED_LIBRARY)
 
-ifeq ($(TARGET_USES_QCOM_BSP),true)
 include $(CLEAR_VARS)
 
 LOCAL_COPY_HEADERS_TO           := qcom/display
@@ -28,4 +27,3 @@ LOCAL_CFLAGS                    += -DLOG_TAG=\"DisplayMetaData\"
 LOCAL_MODULE_TAGS               := optional
 LOCAL_MODULE                    := libqdMetaData
 include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/libqdutils/qdMetaData.cpp b/libqdutils/qdMetaData.cpp
index a53ba07..47e1000 100644
--- a/libqdutils/qdMetaData.cpp
+++ b/libqdutils/qdMetaData.cpp
@@ -35,6 +35,7 @@
 
 int setMetaData(private_handle_t *handle, DispParamType paramType,
                                                     void *param) {
+#ifdef QCOM_BSP
     if (!handle) {
         ALOGE("%s: Private handle is null!", __func__);
         return -1;
@@ -72,5 +73,6 @@ int setMetaData(private_handle_t *handle, DispParamType paramType,
     if(munmap(base, size))
         ALOGE("%s: failed to unmap ptr 0x%x, err %d", __func__, (int)base,
                                                                         errno);
+#endif
     return 0;
 }