diff --git a/core/Android.mk b/core/Android.mk
index 3e2b2eb8..e076dcc4 100644
--- a/core/Android.mk
+++ b/core/Android.mk
@@ -10,6 +10,10 @@ LOCAL_MODULE_OWNER := qcom
 
 LOCAL_MODULE_TAGS := optional
 
+ifeq ($(TARGET_DEVICE),apq8026_lw)
+LOCAL_CFLAGS += -DPDK_FEATURE_SET
+endif
+
 LOCAL_SHARED_LIBRARIES := \
     libutils \
     libcutils \
diff --git a/core/loc_core_log.cpp b/core/loc_core_log.cpp
index d2eda661..1b220104 100644
--- a/core/loc_core_log.cpp
+++ b/core/loc_core_log.cpp
@@ -116,6 +116,7 @@ static loc_name_val_s_type loc_eng_aiding_data_bits[] =
     NAME_VAL( GPS_DELETE_SADATA ),
     NAME_VAL( GPS_DELETE_RTI ),
     NAME_VAL( GPS_DELETE_CELLDB_INFO ),
+#ifndef PDK_FEATURE_SET
     NAME_VAL( GPS_DELETE_ALMANAC_CORR ),
     NAME_VAL( GPS_DELETE_FREQ_BIAS_EST ),
     NAME_VAL( GLO_DELETE_EPHEMERIS ),
@@ -131,6 +132,7 @@ static loc_name_val_s_type loc_eng_aiding_data_bits[] =
     NAME_VAL( BDS_DELETE_ALMANAC_CORR ),
     NAME_VAL( BDS_DELETE_EPHEMERIS ),
     NAME_VAL( BDS_DELETE_ALMANAC ),
+#endif
     NAME_VAL( GPS_DELETE_ALL)
 };
 static int loc_eng_aiding_data_bit_num = sizeof(loc_eng_aiding_data_bits) / sizeof(loc_name_val_s_type);