Fix-build : Do not build bluedroid for 64 bit targets.
This code is not 64 bit safe. In particular, it attempts
to cast pointer types to UINT32 in several places. For now,
build it as a 32 bit library. A 64 bit variant will not be
needed if libbluetooth_jni is also build for 32 bit only.
Change-Id: Ic5f86bd2823083cacf21a852d1c13b4796a7e125
diff --git a/bta/Android.mk b/bta/Android.mk
index 89eca5f..694e701 100644
--- a/bta/Android.mk
+++ b/bta/Android.mk
@@ -82,6 +82,7 @@
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libcutils libc
+LOCAL_MULTILIB := 32
LOCAL_C_INCLUDES+= . \
$(LOCAL_PATH)/include \
diff --git a/gki/Android.mk b/gki/Android.mk
index 116664b..2e8ef56 100644
--- a/gki/Android.mk
+++ b/gki/Android.mk
@@ -27,5 +27,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_SHARED_LIBRARIES := libcutils libc
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_MULTILIB := 32
include $(BUILD_STATIC_LIBRARY)
diff --git a/main/Android.mk b/main/Android.mk
index d76e4d2..4d2cdee 100644
--- a/main/Android.mk
+++ b/main/Android.mk
@@ -134,5 +134,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_REQUIRED_MODULES := libbt-hci libbt-vendor bt_stack.conf bt_did.conf auto_pair_devlist.conf
+LOCAL_MULTILIB := 32
include $(BUILD_SHARED_LIBRARY)
diff --git a/stack/Android.mk b/stack/Android.mk
index 65dc79f..5f5774a 100644
--- a/stack/Android.mk
+++ b/stack/Android.mk
@@ -151,5 +151,6 @@
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_SHARED_LIBRARIES := libcutils libc
+LOCAL_MULTILIB := 32
include $(BUILD_STATIC_LIBRARY)
diff --git a/test/bluedroidtest/Android.mk b/test/bluedroidtest/Android.mk
index bdaf9bf..36deb20 100644
--- a/test/bluedroidtest/Android.mk
+++ b/test/bluedroidtest/Android.mk
@@ -38,5 +38,7 @@
libhardware \
libhardware_legacy
+LOCAL_MULTILIB := 32
+
include $(BUILD_EXECUTABLE)
diff --git a/test/suite/Android.mk b/test/suite/Android.mk
index 0a66141..2f45180 100644
--- a/test/suite/Android.mk
+++ b/test/suite/Android.mk
@@ -38,4 +38,6 @@
LOCAL_CFLAGS += -std=c99 -Wall -Wno-unused-parameter -Wno-missing-field-initializers -Werror
+LOCAL_MULTILIB := 32
+
include $(BUILD_EXECUTABLE)