FM: Convert Android.mk with Android.bp
Convert all FM Android.mk files with Android.bp.
CRs-Fixed: 2605160
Change-Id: I00f7e433608a8b60f6b35e03b99ed85b59736ed3
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index fa59ad3..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,14 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-LOCAL_DIR_PATH:= $(call my-dir)
-
-LOCAL_PRODUCT_MODULE := true
-
-include $(LOCAL_PATH)/jni/Android.mk
-LOCAL_PATH := $(LOCAL_DIR_PATH)
-include $(LOCAL_PATH)/fmapp2/Android.mk
-
-LOCAL_PATH := $(LOCAL_DIR_PATH)
-include $(LOCAL_PATH)/fm_hci/Android.mk
-
-LOCAL_PATH := $(LOCAL_DIR_PATH)
-include $(LOCAL_PATH)/helium/Android.mk
diff --git a/fm_hci/Android.bp b/fm_hci/Android.bp
new file mode 100644
index 0000000..b90565f
--- /dev/null
+++ b/fm_hci/Android.bp
@@ -0,0 +1,26 @@
+
+
+cc_library_shared {
+ name: "libfm-hci",
+
+ srcs: ["fm_hci.cpp"],
+
+ shared_libs: [
+ "libdl",
+ "libcutils",
+ "libbase",
+ "libhidlbase",
+ "liblog",
+ "libutils",
+ "vendor.qti.hardware.fm@1.0",
+ ],
+
+ cflags: ["-Wno-unused-parameter"],
+
+ include_dirs: [
+ "vendor/qcom/opensource/commonsys/fm/helium",
+ ],
+
+ product_specific: true,
+
+}
diff --git a/fm_hci/Android.mk b/fm_hci/Android.mk
deleted file mode 100644
index 18e60b8..0000000
--- a/fm_hci/Android.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
- fm_hci.cpp
-
-LOCAL_SHARED_LIBRARIES := \
- libdl \
- libcutils \
- libbase \
- libhidlbase \
- liblog \
- libutils \
- vendor.qti.hardware.fm@1.0 \
-
-LOCAL_CFLAGS := -Wno-unused-parameter
-
-LOCAL_C_INCLUDES += \
- $(LOCAL_PATH)/../helium \
- $(LOCAL_PATH)/fm_hci
-
-LOCAL_MODULE := libfm-hci
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_CLASS := SHARED_LIBRARIES
-LOCAL_PRODUCT_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/fmapp2/Android.bp b/fmapp2/Android.bp
new file mode 100644
index 0000000..0a8d3c7
--- /dev/null
+++ b/fmapp2/Android.bp
@@ -0,0 +1,13 @@
+
+
+android_app {
+ name: "FM2",
+
+ srcs: ["src/com/caf/fmradio/CommaSeparatedFreqFileReader.java"] + ["src/com/caf/fmradio/FMAdapterApp.java"] + ["src/com/caf/fmradio/FMMediaButtonIntentReceiver.java"] + ["src/com/caf/fmradio/FMRadio.java"] + ["src/com/caf/fmradio/FMRadioService.java"] + ["src/com/caf/fmradio/FmSharedPreferences.java"] + ["src/com/caf/fmradio/FMStats.java"] + ["src/com/caf/fmradio/FmTags.java"] + ["src/com/caf/fmradio/GetNextFreqInterface.java"] + ["src/com/caf/fmradio/HorizontalNumberPicker.java"] + ["src/com/caf/fmradio/PresetList.java"] + ["src/com/caf/fmradio/PresetStation.java"] + ["src/com/caf/fmradio/Settings.java"] + ["src/com/caf/fmradio/StationListActivity.java"] + ["src/com/caf/fmradio/IFMRadioService.aidl"] + ["src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl"] + ["src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl"] + ["src/com/caf/hc_utils/**/*.java"],
+ certificate: "platform",
+ jni_libs: ["libqcomfm_jni"],
+ libs: ["qcom.fmradio"],
+ platform_apis: true,
+ aaptflags: ["--legacy"],
+ product_specific: true,
+}
diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
deleted file mode 100644
index d96a2f8..0000000
--- a/fmapp2/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-ifeq ($(BOARD_HAVE_QCOM_FM),true)
-
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := src/com/caf/fmradio/CommaSeparatedFreqFileReader.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/FMAdapterApp.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/FMMediaButtonIntentReceiver.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/FMRadio.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/FMRadioService.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/FmSharedPreferences.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/FMStats.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/FmTags.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/GetNextFreqInterface.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/HorizontalNumberPicker.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/PresetList.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/PresetStation.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/Settings.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/StationListActivity.java
-LOCAL_SRC_FILES += src/com/caf/fmradio/IFMRadioService.aidl
-LOCAL_SRC_FILES += src/com/caf/fmradio/IFMRadioServiceCallbacks.aidl
-LOCAL_SRC_FILES += src/com/caf/fmradio/IFMTransmitterServiceCallbacks.aidl
-
-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)
-endif
-LOCAL_PACKAGE_NAME := FM2
-LOCAL_CERTIFICATE := platform
-LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni
-LOCAL_JAVA_LIBRARIES := qcom.fmradio
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_AAPT_FLAGS += --legacy
-LOCAL_PRODUCT_MODULE := true
-include $(BUILD_PACKAGE)
-
-endif
diff --git a/helium/Android.bp b/helium/Android.bp
new file mode 100644
index 0000000..3c29a99
--- /dev/null
+++ b/helium/Android.bp
@@ -0,0 +1,23 @@
+
+
+cc_library_shared {
+ name: "fm_helium",
+
+ srcs: [
+ "radio_helium_hal.c",
+ "radio_helium_hal_cmds.c",
+ ],
+
+ shared_libs: [
+ "libfm-hci",
+ "libdl",
+ "liblog",
+ "libnativehelper",
+ "libcutils",
+ ],
+
+ include_dirs: ["vendor/qcom/opensource/commonsys/fm/fm_hci"],
+
+ product_specific: true,
+
+}
diff --git a/helium/Android.mk b/helium/Android.mk
deleted file mode 100644
index 868607e..0000000
--- a/helium/Android.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES:= \
- radio_helium_hal.c \
- radio_helium_hal_cmds.c
-
-LOCAL_SHARED_LIBRARIES := \
- libfm-hci \
- libdl \
- liblog \
- libnativehelper \
- libcutils
-
-FM_HCI_DIR:= vendor/qcom/opensource/commonsys/fm
-
-LOCAL_C_INCLUDES += $(FM_HCI_DIR)/fm_hci
-
-LOCAL_MODULE := fm_helium
-LOCAL_MODULE_TAGS := optional
-LOCAL_PRODUCT_MODULE := true
-
-include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/Android.bp b/jni/Android.bp
new file mode 100644
index 0000000..2bb8c2c
--- /dev/null
+++ b/jni/Android.bp
@@ -0,0 +1,28 @@
+cc_library_shared {
+ name: "libqcomfm_jni",
+
+ product_specific: true,
+ srcs: [
+ "android_hardware_fm.cpp",
+ "ConfFileParser.cpp",
+ "ConfigFmThs.cpp",
+ "FmIoctlsInterface.cpp",
+ "FmPerformanceParams.cpp",
+ ],
+
+ host_ldlibs: ["-ldl"],
+ shared_libs: [
+ "libandroid_runtime",
+ "libnativehelper",
+ "liblog",
+ "libcutils",
+ "libbtconfigstore",
+ ],
+
+ include_dirs: [
+ "vendor/qcom/opensource/commonsys-intf/bluetooth/include",
+ "vendor/qcom/opensource/commonsys/bluetooth_ext/system_bt_ext/btconfigstore",
+ "vendor/qcom/opensource/commonsys/fm/helium",
+ ],
+
+}
diff --git a/jni/Android.mk b/jni/Android.mk
deleted file mode 100644
index a3da551..0000000
--- a/jni/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-ifeq ($(BOARD_HAVE_QCOM_FM),true)
-ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_PRODUCT_MODULE := true
-LOCAL_SRC_FILES:= \
-android_hardware_fm.cpp \
-ConfFileParser.cpp \
-ConfigFmThs.cpp \
-FmIoctlsInterface.cpp \
-FmPerformanceParams.cpp
-
-LOCAL_LDLIBS += -ldl
-LOCAL_SHARED_LIBRARIES := \
- libandroid_runtime \
- libnativehelper \
- liblog \
- libcutils \
- libbtconfigstore
-
-LOCAL_C_INCLUDES +=$(TOP)/libnativehelper/include/nativehelper \
- $(TOP)/vendor/qcom/opensource/commonsys-intf/bluetooth/include \
- $(TOP)/vendor/qcom/opensource/commonsys/bluetooth_ext/system_bt_ext/btconfigstore \
- vendor/qcom/opensource/commonsys/fm/helium
-
-LOCAL_MODULE := libqcomfm_jni
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_SHARED_LIBRARY)
-
-endif # is-vendor-board-platform
-endif # BOARD_HAVE_QCOM_FM
diff --git a/Android.bp b/qcom/fmradio/Android.bp
similarity index 82%
rename from Android.bp
rename to qcom/fmradio/Android.bp
index 63687df..29817d8 100644
--- a/Android.bp
+++ b/qcom/fmradio/Android.bp
@@ -7,6 +7,5 @@
name: "qcom.fmradio",
defaults: ["qcom.fmradio_defaults"],
installable: true,
-
- srcs: ["qcom/fmradio/**/*.java"],
+ srcs: ["**/*.java"],
}