Build separate sonivox libs with and without jet
and remove more unused code.
Bug: 151448144
Test: build
Change-Id: I6c5ef52c3fe3a00d1bd578005a77a07016540297
diff --git a/arm-wt-22k/Android.bp b/arm-wt-22k/Android.bp
index ad4db48..62e4115 100644
--- a/arm-wt-22k/Android.bp
+++ b/arm-wt-22k/Android.bp
@@ -1,5 +1,5 @@
-cc_library {
- name: "libsonivox",
+cc_defaults {
+ name: "libsonivox-defaults",
srcs: [
"lib_src/eas_data.c",
"lib_src/eas_dlssynth.c",
@@ -30,7 +30,6 @@
"lib_src/eas_xmf.c",
"lib_src/eas_xmfdata.c",
"lib_src/wt_22khz.c",
- "lib_src/jet.c",
"host_src/eas_config.c",
"host_src/eas_hostmm.c",
"host_src/eas_report.c",
@@ -114,3 +113,23 @@
],
}
}
+
+cc_library {
+ name: "libsonivoxwithoutjet",
+ defaults: ["libsonivox-defaults"],
+ apex_available: ["com.android.media"],
+}
+
+cc_library {
+ name: "libsonivox",
+ defaults: ["libsonivox-defaults"],
+ srcs: [
+ "lib_src/jet.c",
+ ],
+
+ cflags: [
+ "-DJET_INTERFACE",
+ ],
+}
+
+