commit 890193006c4520021369de56deb8a5f717ca6529
author Ricardo Cerqueira <cyanogenmod@cerqueira.org> Sun Jan 19 19:08:17 2014 +0000
committer LuK1337 <priv.luk@gmail.com> Tue Oct 08 15:20:58 2019 +0200
tree cec55e21919258b3fa9e8370f76f9b2abb5fdbff
parent 2bf6ff01c09c1c4fdccaace53addc82b0c89f74f

FM: Break bootclasspath dependency

Use the library directly instead of forcing its global inclusion

Change-Id: I547c85b1b6c4ce09333e2eac2059cca1b851a346

fmapp2/Android.mk

diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
index a98adb5..9847dfe 100644
--- a/fmapp2/Android.mk
+++ b/fmapp2/Android.mk
@@ -30,6 +30,7 @@
 LOCAL_CERTIFICATE := platform
 LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni
 LOCAL_JAVA_LIBRARIES := qcom.fmradio
+LOCAL_REQUIRED_MODULES := qcom.fmradio.xml
 LOCAL_PRIVATE_PLATFORM_APIS := true
 include $(BUILD_PACKAGE)
 

fmapp2/AndroidManifest.xml

diff --git a/fmapp2/AndroidManifest.xml b/fmapp2/AndroidManifest.xml
index 8f373e8..a5a5a83 100644
--- a/fmapp2/AndroidManifest.xml
+++ b/fmapp2/AndroidManifest.xml
@@ -51,6 +51,10 @@
         android:allowTaskReparenting="true"
         android:taskAffinity="com.caf.task.fmradio"
         android:name=".FMAdapterApp">
+
+        <uses-library android:name="qcom.fmradio"
+            android:required="true" />
+
         <activity android:icon="@drawable/ic_launcher_fmradio"
             android:name=".FMRadio"
             android:label="@string/app_name"