1 files changed, 9 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index e2c5a56..6b2d419 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,12 @@
 ifneq ($(BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE),)
 LOCAL_PATH := $(call my-dir)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
-endif
+ifneq ($(filter msm8960 apq8064 ,$(TARGET_BOARD_PLATFORM)),)
+    #For msm8960/apq8064 targets
+    include $(call all-named-subdir-makefiles,msm8960)
+else
+    #For all other targets
+    GPS_DIRS=core utils loc_api platform_lib_abstractions etc
+    include $(call all-named-subdir-makefiles,$(GPS_DIRS))
+endif #TARGET_BOARD_PLATFORM
+endif #BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE