From 73711e63ca3d42a18ce234cfd818f65ac91e11e1 Mon Sep 17 00:00:00 2001 From: Jaap Jan Meijer Date: Wed, 11 May 2016 20:44:04 +0200 Subject: [PATCH] Android: Add CM_ANDROID_VERSION macro Signed-off-by: Jaap Jan Meijer --- android/Android.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android/Android.mk b/android/Android.mk index bdc639f51..55cdeb87b 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -5,6 +5,8 @@ BLUEZ_VERSION := `grep "^AC_INIT" $(LOCAL_PATH)/bluez/configure.ac | sed -e "s/. ANDROID_VERSION := $(shell echo $(PLATFORM_VERSION) | awk -F. '{ printf "0x%02d%02d%02d",$$1,$$2,$$3 }') +CM_ANDROID_VERSION := $(shell echo $(CM_VERSION) | awk -F. '{ printf "0x%02d%02d00",$$1,$$2 }') + ANDROID_GE_5_0_0 := $(shell test `echo $$(($(ANDROID_VERSION)))` -lt `echo $$((0x050000))`; echo $$?) # Specify pathmap for glib and sbc @@ -14,6 +16,7 @@ pathmap_INCL += glib:external/bluetooth/glib \ # Specify common compiler flags BLUEZ_COMMON_CFLAGS := -DVERSION=\"$(BLUEZ_VERSION)\" \ -DANDROID_VERSION=$(ANDROID_VERSION) \ + -DCM_ANDROID_VERSION=$(CM_ANDROID_VERSION) \ -DANDROID_STORAGEDIR=\"/data/misc/bluetooth\" \ -DHAVE_LINUX_IF_ALG_H \ -DHAVE_LINUX_TYPES_H \ -- 2.11.0