diff --git a/fmapp/Android.mk b/fmapp/Android.mk
index 8692b8c..68569c4 100644
--- a/fmapp/Android.mk
+++ b/fmapp/Android.mk
@@ -10,7 +10,7 @@
         src/com/codeaurora/fmradio/IFMTransmitterService.aidl \
 
 
-ifeq ($(call is-android-codename-in-list,JELLY_BEAN ICECREAM_SANDWICH HONEYCOMB),true)
+ifeq ($(call is-platform-sdk-version-at-least,11),true)
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/codeaurora/hc_utils)
 else
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/codeaurora/utils)
diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
index 3985572..47c8a1b 100644
--- a/fmapp2/Android.mk
+++ b/fmapp2/Android.mk
@@ -4,13 +4,13 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-java-files-under, src/com/caf/fmradio) \
-	src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl \
-	src/com/caf/fmradio/IFMRadioService.aidl \
-	src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl \
-	src/com/caf/fmradio/IFMTransmitterService.aidl \
+        src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl \
+        src/com/caf/fmradio/IFMRadioService.aidl \
+        src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl \
+        src/com/caf/fmradio/IFMTransmitterService.aidl \
 
 
-ifeq ($(call is-android-codename-in-list,JELLY_BEAN ICECREAM_SANDWICH HONEYCOMB),true)
+ifeq ($(call is-platform-sdk-version-at-least,11),true)
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/caf/hc_utils)
 else
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/caf/utils)