commit 403c19657fd188000ca50643008438177961d2e7
author Linux Build Service Account <lnxbuild@localhost> Tue Dec 24 07:25:58 2013 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 24 07:25:58 2013 -0800
tree 34f9c3d653fde2c7c056d0374dc5d5c81618aa7e
parent 9745ad619e26c1d3ed02968eb6954e5a93691346
parent 35122243d0a1c6209142ab76cb911f02fd4f2802

Merge "fmrecord: Stop recording when sd card is unmounted"

Android.mk

diff --git a/Android.mk b/Android.mk
index a08bbc1..60620d4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 LOCAL_PATH:= $(call my-dir)
 LOCAL_DIR_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
@@ -14,8 +14,6 @@
 
 include $(LOCAL_PATH)/jni/Android.mk
 LOCAL_PATH := $(LOCAL_DIR_PATH)
-include $(LOCAL_PATH)/fmapp/Android.mk
-LOCAL_PATH := $(LOCAL_DIR_PATH)
 include $(LOCAL_PATH)/fmapp2/Android.mk
 LOCAL_PATH := $(LOCAL_DIR_PATH)
 include $(LOCAL_PATH)/FMRecord/Android.mk

FMRecord/Android.mk

diff --git a/FMRecord/Android.mk b/FMRecord/Android.mk
index 00837f0..647b941 100644
--- a/FMRecord/Android.mk
+++ b/FMRecord/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 

fmapp/Android.mk

diff --git a/fmapp/Android.mk b/fmapp/Android.mk
index 68569c4..cb1f066 100644
--- a/fmapp/Android.mk
+++ b/fmapp/Android.mk
@@ -10,7 +10,7 @@
         src/com/codeaurora/fmradio/IFMTransmitterService.aidl \
 
 
-ifeq ($(call is-platform-sdk-version-at-least,11),true)
+ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 11 ))" )))
 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)

fmapp2/Android.mk

diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
index 47c8a1b..d899d9c 100644
--- a/fmapp2/Android.mk
+++ b/fmapp2/Android.mk
@@ -10,7 +10,7 @@
         src/com/caf/fmradio/IFMTransmitterService.aidl \
 
 
-ifeq ($(call is-platform-sdk-version-at-least,11),true)
+ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 11 ))" )))
 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)

fmapp2/AndroidManifest.xml

diff --git a/fmapp2/AndroidManifest.xml b/fmapp2/AndroidManifest.xml
index 57c0b23..aeb3a1c 100644
--- a/fmapp2/AndroidManifest.xml
+++ b/fmapp2/AndroidManifest.xml
@@ -48,12 +48,14 @@
     <application
         android:icon="@drawable/ic_launcher_fmradio"
         android:label="@string/app_name"
+        android:allowTaskReparenting="true"
+        android:taskAffinity="com.caf.task.fmradio"
         android:name=".FMAdapterApp">
         <activity android:icon="@drawable/ic_launcher_fmradio"
             android:name=".FMRadio"
             android:label="@string/app_name"
             android:clearTaskOnLaunch="true"
-            android:taskAffinity=""
+            android:allowTaskReparenting="true"
             android:launchMode="singleTask"
             android:excludeFromRecents="false" >
 

jni/Android.mk

diff --git a/jni/Android.mk b/jni/Android.mk
index 594332f..56f7da3 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)