diff --git a/ipacm/src/Android.mk b/ipacm/src/Android.mk
index 9a4d659..be6c3e8 100644
--- a/ipacm/src/Android.mk
+++ b/ipacm/src/Android.mk
@@ -1,3 +1,4 @@
+ifneq ($(TARGET_HAS_IPA_IN_DEVTREE),true)
 BOARD_PLATFORM_LIST := msm8916
 BOARD_PLATFORM_LIST += msm8909
 ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
@@ -98,3 +99,4 @@
 endif # $(TARGET_ARCH)
 endif
 endif
+endif # $(TARGET_HAS_IPA_IN_DEVTREE)
diff --git a/ipanat/src/Android.mk b/ipanat/src/Android.mk
index a54a57a..cceed4f 100644
--- a/ipanat/src/Android.mk
+++ b/ipanat/src/Android.mk
@@ -1,3 +1,4 @@
+ifneq ($(TARGET_HAS_IPA_IN_DEVTREE), true)
 BOARD_PLATFORM_LIST := msm8916
 BOARD_PLATFORM_LIST += msm8909
 ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
@@ -25,4 +26,5 @@
 
 endif # $(TARGET_ARCH)
 endif
-endif
\ No newline at end of file
+endif
+endif # $(TARGET_HAS_IPA_IN_DEVTREE)
diff --git a/ipanat/test/Android.mk b/ipanat/test/Android.mk
index 4c94b56..5817e74 100644
--- a/ipanat/test/Android.mk
+++ b/ipanat/test/Android.mk
@@ -1,3 +1,4 @@
+ifneq ($(TARGET_HAS_IPA_IN_DEVTREE), true)
 BOARD_PLATFORM_LIST := msm8916
 BOARD_PLATFORM_LIST += msm8909
 ifneq ($(call is-board-platform-in-list,$(BOARD_PLATFORM_LIST)),true)
@@ -50,4 +51,5 @@
 
 endif # $(TARGET_ARCH)
 endif
-endif
\ No newline at end of file
+endif
+endif # $(TARGET_HAS_IPA_IN_DEVTREE)