Merge "Clean up FM define usage." into gingerbread (e4beb081) · Commits · e / os / android_frameworks_base

core/jni/Android.mk

+19 −17

Original line number	Diff line number	Diff line
		@@ -145,27 +145,29 @@ LOCAL_SRC_FILES:= \
		android_content_res_Configuration.cpp

		ifeq ($(BOARD_HAVE_FM_RADIO),true)
		ifeq ($(BOARD_FM_DEVICE),)
		BOARD_FM_DEVICE := $(BOARD_WLAN_DEVICE)
		endif

		ifeq ($(BOARD_FM_DEVICE),si4709)
		LOCAL_SRC_FILES += android_hardware_fm_si4709.cpp
		else
		endif
		ifeq ($(BOARD_FM_DEVICE),si4708)
		LOCAL_SRC_FILES += android_hardware_fm_si4708.cpp
		else
		ifeq ($(BOARD_WLAN_DEVICE),bcm4329)
		endif
		ifeq ($(BOARD_FM_DEVICE),bcm4329)
		LOCAL_SRC_FILES += android_hardware_fm_bcm4325.cpp
		endif
		ifeq ($(BOARD_WLAN_DEVICE),bcm4325)
		ifeq ($(BOARD_FM_DEVICE),bcm4325)
		LOCAL_SRC_FILES += android_hardware_fm_bcm4325.cpp
		endif
		ifeq ($(BOARD_WLAN_DEVICE),wl1251)
		ifeq ($(BOARD_FM_DEVICE),wl1251)
		LOCAL_SRC_FILES += android_hardware_fm_wl1271.cpp
		endif
		ifeq ($(BOARD_WLAN_DEVICE),wl1271)
		ifeq ($(BOARD_FM_DEVICE),wl1271)
		LOCAL_SRC_FILES += android_hardware_fm_wl1271.cpp
		endif
		endif
		endif
		endif

		LOCAL_C_INCLUDES += \
		$(JNI_H_INCLUDE) \