From 6774ae9b21b0c96b47e9a6fc25d21eb7f2c045a1 Mon Sep 17 00:00:00 2001 From: Arne Coucheron Date: Sun, 2 Feb 2014 09:40:16 +0100 Subject: FM2: Drop BOARD_HAVE_QCOM_FM flag * Only devices supporting this will build it anyway. Change-Id: Ic0569d7c8c37427150c2f1dc6e3d1040d619dfc1 --- Android.mk | 2 -- FMRecord/Android.mk | 2 -- fmapp/Android.mk | 4 ---- fmapp2/Android.mk | 4 ---- jni/Android.mk | 2 -- 5 files changed, 14 deletions(-) diff --git a/Android.mk b/Android.mk index 39d9305..0fbf3ae 100644 --- a/Android.mk +++ b/Android.mk @@ -1,6 +1,5 @@ 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) @@ -21,6 +20,5 @@ 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) diff --git a/FMRecord/Android.mk b/FMRecord/Android.mk index b248bc3..7e12f29 100644 --- a/FMRecord/Android.mk +++ b/FMRecord/Android.mk @@ -1,4 +1,3 @@ -ifeq ($(BOARD_HAVE_QCOM_FM),true) ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM))) LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -12,4 +11,3 @@ LOCAL_CERTIFICATE := platform LOCAL_PROGUARD_ENABLED := disabled include $(BUILD_PACKAGE) endif -endif # BOARD_HAVE_QCOM_FM diff --git a/fmapp/Android.mk b/fmapp/Android.mk index cb1f066..2bb92f6 100644 --- a/fmapp/Android.mk +++ b/fmapp/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(BOARD_HAVE_QCOM_FM),true) - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -20,5 +18,3 @@ LOCAL_CERTIFICATE := platform LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni LOCAL_JAVA_LIBRARIES := qcom.fmradio include $(BUILD_PACKAGE) - -endif diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk index d899d9c..26c6791 100644 --- a/fmapp2/Android.mk +++ b/fmapp2/Android.mk @@ -1,5 +1,3 @@ -ifeq ($(BOARD_HAVE_QCOM_FM),true) - LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -21,5 +19,3 @@ LOCAL_JNI_SHARED_LIBRARIES := libqcomfm_jni LOCAL_JAVA_LIBRARIES := qcom.fmradio include $(BUILD_PACKAGE) - -endif diff --git a/jni/Android.mk b/jni/Android.mk index 5bc46d3..97d5a7b 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,4 +1,3 @@ -ifeq ($(BOARD_HAVE_QCOM_FM),true) ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM))) LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) @@ -22,4 +21,3 @@ LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) endif # is-vendor-board-platform -endif # BOARD_HAVE_QCOM_FM -- cgit v1.2.3