diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
index d899d9c291528437e5d1bac5906418ecf6305888..121fcbb2d4a39f058216b983e97481793cebab9e 100644
--- a/fmapp2/Android.mk
+++ b/fmapp2/Android.mk
@@ -3,12 +3,24 @@ ifeq ($(BOARD_HAVE_QCOM_FM),true)
 LOCAL_PATH:= $(call my-dir)
 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 \
-
+LOCAL_SRC_FILES := src/com/caf/fmradio/CommaSeparatedFreqFileReader.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/FMAdapterApp.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/FMMediaButtonIntentReceiver.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/FMRadio.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/FMRadioService.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/FmSharedPreferences.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/FMStats.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/FmTags.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/GetNextFreqInterface.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/HorizontalNumberPicker.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/PresetList.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/PresetStation.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/Settings.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/StationListActivity.java
+LOCAL_SRC_FILES += src/com/caf/fmradio/IFMRadioService.aidl
+LOCAL_SRC_FILES += src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl
+LOCAL_SRC_FILES += src/com/caf/fmradio/IFMTransmitterService.aidl
+LOCAL_SRC_FILES += src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl
 
 ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 11 ))" )))
 LOCAL_SRC_FILES +=  $(call all-java-files-under, src/com/caf/hc_utils)