diff --git a/android/Android.mk b/android/Android.mk
index db5032d..8887a97 100644
--- a/android/Android.mk
+++ b/android/Android.mk
-DANDROID_VERSION=$(ANDROID_VERSION) \
-DANDROID_STORAGEDIR=\"/data/misc/bluetooth\" \
+ifeq ($(BLUEZ_EXTENSIONS), true)
+BLUEZ_COMMON_CFLAGS += -DBLUEZ_EXTENSIONS
+endif
+
# Enable warnings enabled in autotools build
BLUEZ_COMMON_CFLAGS += -Wall -Wextra \
-Wdeclaration-after-statement \
LOCAL_CFLAGS := $(BLUEZ_COMMON_CFLAGS)
-ifeq ($(BLUEZ_EXTENSIONS), true)
-LOCAL_CFLAGS += -DBLUEZ_EXTENSIONS
-endif
-
LOCAL_MODULE := bluetooth.default
LOCAL_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/hw
LOCAL_MODULE_TAGS := optional