diff --git a/BoardConfig.mk b/BoardConfig.mk
index 0609405..3f0b973 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -55,6 +55,9 @@ TARGET_NO_RPC := true
 USE_DEVICE_SPECIFIC_GPS := true
 BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)
 
+# HDIL - enable this for ROMs build base/transport hidl in their sources
+#BUILD_DEVICE_LIBHIDL := false
+
 # Init
 TARGET_INIT_VENDOR_LIB := libinit_sanders
 TARGET_RECOVERY_DEVICE_MODULES := libinit_sanders
diff --git a/libhidl/Android.mk b/libhidl/Android.mk
index c02404c..7f2fd93 100644
--- a/libhidl/Android.mk
+++ b/libhidl/Android.mk
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ifeq ($(filter false,$(BUILD_DEVICE_LIBHIDL)),)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := \
@@ -35,3 +36,4 @@ LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_VENDOR_MODULE := true
 include $(BUILD_SHARED_LIBRARY)
+endif