fm: Fix dependency compile error
When enforce compile time product I/F, product module
cannot link to system module except VNDK libraries.
System_ext module cannot link to product module and vice versa.
System_ext module can link to system with no restrictions.
libandroid_runtime.so is FWK-Only.so.
libnativehelper.so is not SDK/NDK APIs.
libbtconfigstore is vendor lib, now is in system_ext.
Move libqcomfm_jni and its apks to system_ext.
It will fix the errors:
error: dependency "libandroid_runtime" of "libqcomfm_jni" missing variant:
error: dependency "libnativehelper" of "libqcomfm_jni" missing variant:
error: dependency "libbtconfigstore" of "libqcomfm_jni" missing variant:
"qcom.fmradio.jar" belongs to PRODUCT_BOOT_JARS, should be in system partition same as boot.jar
Change-Id: If7805383bd0a31e5525bcca86c131abb9b17d70f
CRs-Fixed: 2643210
diff --git a/fm_hci/Android.bp b/fm_hci/Android.bp
index b90565f..764b6c4 100644
--- a/fm_hci/Android.bp
+++ b/fm_hci/Android.bp
@@ -21,6 +21,6 @@
"vendor/qcom/opensource/commonsys/fm/helium",
],
- product_specific: true,
+ system_ext_specific: true,
}
diff --git a/fmapp2/Android.bp b/fmapp2/Android.bp
old mode 100644
new mode 100755
index 0a8d3c7..a2ef6ab
--- a/fmapp2/Android.bp
+++ b/fmapp2/Android.bp
@@ -9,5 +9,5 @@
libs: ["qcom.fmradio"],
platform_apis: true,
aaptflags: ["--legacy"],
- product_specific: true,
+ system_ext_specific: true,
}
diff --git a/helium/Android.bp b/helium/Android.bp
index 3c29a99..b10722e 100644
--- a/helium/Android.bp
+++ b/helium/Android.bp
@@ -18,6 +18,6 @@
include_dirs: ["vendor/qcom/opensource/commonsys/fm/fm_hci"],
- product_specific: true,
+ system_ext_specific: true,
}
diff --git a/jni/Android.bp b/jni/Android.bp
old mode 100644
new mode 100755
index 9696223..1d6e8e0
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -1,7 +1,7 @@
cc_library_shared {
name: "libqcomfm_jni",
- product_specific: true,
+ system_ext_specific: true,
srcs: [
"android_hardware_fm.cpp",
],