FM: QSSI changes
- remove redundant code
- remove items going into vendor image
- remove target specific tags
Change-Id: If3bd34bbdc353851a1007ff9fcb67cf44da8f61c
diff --git a/Android.mk b/Android.mk
index c5b42d9..be7cefc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,10 +4,6 @@
LOCAL_MODULE_TAGS := optional
-#ifneq ($(TARGET_USES_AOSP),true)
-
-#ifeq ($(BOARD_HAVE_QCOM_FM),true)
-#ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
LOCAL_SRC_FILES := $(call all-java-files-under, qcom/fmradio)
LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni
@@ -20,25 +16,13 @@
ifeq ($(BOARD_HAS_QCA_FM_SOC), "cherokee")
LOCAL_CFLAGS += -DFM_SOC_TYPE_CHEROKEE
endif
+
include $(LOCAL_PATH)/jni/Android.mk
LOCAL_PATH := $(LOCAL_DIR_PATH)
include $(LOCAL_PATH)/fmapp2/Android.mk
-#LOCAL_PATH := $(LOCAL_DIR_PATH)
-#include $(LOCAL_PATH)/FMRecord/Android.mk
-
LOCAL_PATH := $(LOCAL_DIR_PATH)
include $(LOCAL_PATH)/fm_hci/Android.mk
LOCAL_PATH := $(LOCAL_DIR_PATH)
include $(LOCAL_PATH)/helium/Android.mk
-
-LOCAL_PATH := $(LOCAL_DIR_PATH)
-#include $(LOCAL_PATH)/fmhalService/Android.mk
-
-#endif # is-vendor-board-platform
-#endif # BOARD_HAVE_QCOM_FM
-#endif # Not (TARGET_USES_AOSP)
-
-LOCAL_PATH := $(LOCAL_DIR_PATH)
-include $(LOCAL_PATH)/libfm_jni/Android.mk