diff --git a/gps/core/Android.mk b/gps/core/Android.mk
index 3a23c1e..c963894 100644
--- a/gps/core/Android.mk
+++ b/gps/core/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(BUILD_TINY_ANDROID),true)
+#ifneq ($(BUILD_TINY_ANDROID),true)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -52,4 +52,4 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-endif # not BUILD_TINY_ANDROID
+#endif # not BUILD_TINY_ANDROID
diff --git a/gps/loc_api/ds_api/Android.mk b/gps/loc_api/ds_api/Android.mk
index 6400cc4..fe48d9f 100644
--- a/gps/loc_api/ds_api/Android.mk
+++ b/gps/loc_api/ds_api/Android.mk
@@ -1,5 +1,5 @@
-ifneq ($(QCPATH),)
-ifneq ($(BUILD_TINY_ANDROID),true)
+#ifneq ($(QCPATH),)
+#ifneq ($(BUILD_TINY_ANDROID),true)
 
 LOCAL_PATH := $(call my-dir)
 
@@ -47,5 +47,5 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-endif # not BUILD_TINY_ANDROID
-endif # QCPATH
+#endif # not BUILD_TINY_ANDROID
+#endif # QCPATH
diff --git a/gps/loc_api/libloc_api_50001/Android.mk b/gps/loc_api/libloc_api_50001/Android.mk
index 7e5c4e5..da4341f 100644
--- a/gps/loc_api/libloc_api_50001/Android.mk
+++ b/gps/loc_api/libloc_api_50001/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(BUILD_TINY_ANDROID),true)
+#ifneq ($(BUILD_TINY_ANDROID),true)
 #Compile this library only for builds with the latest modem image
 
 LOCAL_PATH := $(call my-dir)
@@ -114,4 +114,4 @@
 
 include $(BUILD_SHARED_LIBRARY)
 
-endif # not BUILD_TINY_ANDROID
+#endif # not BUILD_TINY_ANDROID
diff --git a/gps/loc_api/loc_api_v02/Android.mk b/gps/loc_api/loc_api_v02/Android.mk
index c3cc2f3..b9ef805 100644
--- a/gps/loc_api/loc_api_v02/Android.mk
+++ b/gps/loc_api/loc_api_v02/Android.mk
@@ -1,6 +1,3 @@
-ifneq ($(QCPATH),)
-ifneq ($(BUILD_TINY_ANDROID),true)
-
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
@@ -56,6 +53,3 @@
 LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_SHARED_LIBRARY)
-
-endif # not BUILD_TINY_ANDROID
-endif # QCPATH