commit 554eeec5ebf2a1e93ee823b874169de5313d6654
author Linux Build Service Account <lnxbuild@localhost> Tue Jul 21 05:47:06 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jul 21 05:47:06 2015 -0700
tree f57194c6967e03d765873021a3e42c38bec9879b
parent 5b5a3cd72012f242743906ed18dfd1f1eac217e8
parent 37648a2b6a8943d643d5a2b93dd1cf97acf24ab3

Merge changes I55bfcddf,Ida0c2251 into private_master

* changes:
  FM: Disable QCT FM app
  FM: Build libfmjni by default

Android.mk

diff --git a/Android.mk b/Android.mk
index 027bddf..cfbd558 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,13 +1,14 @@
-ifneq ($(TARGET_USES_AOSP),true)
-
-ifeq ($(BOARD_HAVE_QCOM_FM),true)
-ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
 LOCAL_PATH:= $(call my-dir)
 LOCAL_DIR_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
+ifneq ($(TARGET_USES_AOSP),true)
+
+ifeq ($(BOARD_HAVE_QCOM_FM),true)
+ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
+
 LOCAL_SRC_FILES := $(call all-java-files-under, qcom/fmradio)
 LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni
 
@@ -16,13 +17,14 @@
 include $(BUILD_JAVA_LIBRARY)
 
 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)/FMRecord/Android.mk
-LOCAL_PATH := $(LOCAL_DIR_PATH)
-include $(LOCAL_PATH)/libfm_jni/Android.mk
+#LOCAL_PATH := $(LOCAL_DIR_PATH)
+#include $(LOCAL_PATH)/fmapp2/Android.mk
+#LOCAL_PATH := $(LOCAL_DIR_PATH)
+#include $(LOCAL_PATH)/FMRecord/Android.mk
 endif # is-vendor-board-platform
 endif # BOARD_HAVE_QCOM_FM
 
 endif # Not (TARGET_USES_AOSP)
+
+LOCAL_PATH := $(LOCAL_DIR_PATH)
+include $(LOCAL_PATH)/libfm_jni/Android.mk