summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorAnurag Gupta <anurag.gupta@stericsson.com>2012-07-18 16:18:35 +0530
committerGerrit Code Review <gerrit@review.cyanogenmod.com>2013-02-09 10:39:42 -0800
commit44f2f8d10e87fd315abeb267a3159f2e00ce8e73 (patch)
tree538615c69de88d72173a6e1683744288a9e34978 /Android.mk
parentc26fe2aa66679a2f64d9fb8fd28d7149293fe421 (diff)
downloadframeworks_base-44f2f8d10e87fd315abeb267a3159f2e00ce8e73.zip
frameworks_base-44f2f8d10e87fd315abeb267a3159f2e00ce8e73.tar.gz
frameworks_base-44f2f8d10e87fd315abeb267a3159f2e00ce8e73.tar.bz2
FM Radio: Add support for FM Radio in Android
Creating interface and framework for using FM Radio RX and TX from different vendors. Signed-off-by: Christian Bejram <christian.bejram@stericsson.com> Change-Id: I1a71aed01bfffdddfabf1cdfbfa3707cb1ed016b Conflicts: core/java/android/app/ContextImpl.java
Diffstat (limited to 'Android.mk')
-rwxr-xr-x[-rw-r--r--]Android.mk21
1 files changed, 16 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk
index 61a17f1..6720ae9 100644..100755
--- a/Android.mk
+++ b/Android.mk
@@ -26,8 +26,6 @@ LOCAL_PATH := $(call my-dir)
# TODO: find a more appropriate way to do this.
framework_res_source_path := APPS/framework-res_intermediates/src
-# the library
-# ============================================================
include $(CLEAR_VARS)
# FRAMEWORKS_BASE_SUBDIRS comes from build/core/pathmap.mk
@@ -225,7 +223,21 @@ LOCAL_SRC_FILES += \
wifi/java/android/net/wifi/p2p/IWifiP2pManager.aidl \
voip/java/android/net/sip/ISipSession.aidl \
voip/java/android/net/sip/ISipSessionListener.aidl \
- voip/java/android/net/sip/ISipService.aidl
+ voip/java/android/net/sip/ISipService.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IFmReceiver.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IFmTransmitter.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnStateChangedListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnStartedListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnErrorListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnScanListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnForcedPauseListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnForcedResetListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnBlockScanListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnRDSDataFoundListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnSignalStrengthListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnStereoListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnExtraCommandListener.aidl \
+ fmradio/java/com/stericsson/hardware/fm/IOnAutomaticSwitchListener.aidl
#
@@ -558,7 +570,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES:=$(framework_docs_LOCAL_API_CHECK_SRC_FILES)
LOCAL_INTERMEDIATE_SOURCES:=$(framework_docs_LOCAL_INTERMEDIATE_SOURCES)
-LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES)
+LOCAL_JAVA_LIBRARIES:=$(framework_docs_LOCAL_JAVA_LIBRARIES) framework
LOCAL_MODULE_CLASS:=$(framework_docs_LOCAL_MODULE_CLASS)
LOCAL_DROIDDOC_SOURCE_PATH:=$(framework_docs_LOCAL_DROIDDOC_SOURCE_PATH)
LOCAL_DROIDDOC_HTML_DIR:=$(framework_docs_LOCAL_DROIDDOC_HTML_DIR)
@@ -735,7 +747,6 @@ LOCAL_DX_FLAGS := --core-library
include $(BUILD_JAVA_LIBRARY)
-
# Include subdirectory makefiles
# ============================================================