Convert qcom.fmradio into Android.bp module
Modules in PRODUCT_BOOT_JARS need to be Android.bp modules.
Bug: 124520734
Change-Id: Icd858816b1f0cb53ec0fcb40f0aa73ce80983676
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..63687df
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,12 @@
+java_defaults {
+ name: "qcom.fmradio_defaults",
+ jni_libs: ["libqcomfm_jni"],
+}
+
+java_library {
+ name: "qcom.fmradio",
+ defaults: ["qcom.fmradio_defaults"],
+ installable: true,
+
+ srcs: ["qcom/fmradio/**/*.java"],
+}
diff --git a/Android.mk b/Android.mk
index be7cefc..67b0366 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,21 +1,5 @@
LOCAL_PATH:= $(call my-dir)
LOCAL_DIR_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-
-LOCAL_SRC_FILES := $(call all-java-files-under, qcom/fmradio)
-LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni
-
-LOCAL_SHARED_LIBRARIES := liblog
-LOCAL_MODULE:= qcom.fmradio
-
-include $(BUILD_JAVA_LIBRARY)
-
-ifeq ($(BOARD_HAS_QCA_FM_SOC), "cherokee")
-LOCAL_CFLAGS += -DFM_SOC_TYPE_CHEROKEE
-endif
include $(LOCAL_PATH)/jni/Android.mk
LOCAL_PATH := $(LOCAL_DIR_PATH)