From ead561488e4fbb1c981a9c6fff79a39864b7caf4 Mon Sep 17 00:00:00 2001
From: AUDITYA BHATTARAM <audityab@codeaurora.org>
Date: Thu, 14 Nov 2013 22:11:02 +0530
Subject: [PATCH] Remove AOSP reference to utils.mk
Remove function calls from AOSP code to utils.mk
& replace them with actual definition.
Change-Id: I9262eefbb3ca75954a2e159696abc36c80df9c7b
CRs-fixed: 566287
---
Android.mk | 2 +-
FMRecord/Android.mk | 2 +-
fmapp/Android.mk | 2 +-
fmapp2/Android.mk | 2 +-
jni/Android.mk | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Android.mk b/Android.mk
index a08bbc1..e0d9fea 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
LOCAL_PATH:= $(call my-dir)
LOCAL_DIR_PATH:= $(call my-dir)
include $(CLEAR_VARS)
diff --git a/FMRecord/Android.mk b/FMRecord/Android.mk
index 00837f0..647b941 100644
--- a/FMRecord/Android.mk
+++ b/FMRecord/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
diff --git a/fmapp/Android.mk b/fmapp/Android.mk
index 68569c4..cb1f066 100644
--- a/fmapp/Android.mk
+++ b/fmapp/Android.mk
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/com/codeaurora/fmradio) \
src/com/codeaurora/fmradio/IFMTransmitterService.aidl \
-ifeq ($(call is-platform-sdk-version-at-least,11),true)
+ifeq (1,$(filter 1,$(shell echo "$$(( $(PLATFORM_SDK_VERSION) >= 11 ))" )))
LOCAL_SRC_FILES += $(call all-java-files-under, src/com/codeaurora/hc_utils)
else
LOCAL_SRC_FILES += $(call all-java-files-under, src/com/codeaurora/utils)
diff --git a/fmapp2/Android.mk b/fmapp2/Android.mk
index 47c8a1b..d899d9c 100644
--- a/fmapp2/Android.mk
+++ b/fmapp2/Android.mk
@@ -10,7 +10,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src/com/caf/fmradio) \
src/com/caf/fmradio/IFMTransmitterService.aidl \
-ifeq ($(call is-platform-sdk-version-at-least,11),true)
+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)
diff --git a/jni/Android.mk b/jni/Android.mk
index 594332f..56f7da3 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,4 +1,4 @@
-ifeq ($(call is-vendor-board-platform,QCOM),true)
+ifneq (,$(filter $(QCOM_BOARD_PLATFORMS),$(TARGET_BOARD_PLATFORM)))
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
--
GitLab