Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38338795 authored May 07, 2014 by Narayan Kamath

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

parent 47194d04

gki/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,5 +27,6 @@ LOCAL_MODULE := libbt-brcm_gki
		LOCAL_MODULE_TAGS := optional
		LOCAL_SHARED_LIBRARIES := libcutils libc
		LOCAL_MODULE_CLASS := STATIC_LIBRARIES
		LOCAL_MULTILIB := 32

		include $(BUILD_STATIC_LIBRARY)

system/bta/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -82,6 +82,7 @@ LOCAL_MODULE := libbt-brcm_bta
		LOCAL_MODULE_CLASS := STATIC_LIBRARIES
		LOCAL_MODULE_TAGS := optional
		LOCAL_SHARED_LIBRARIES := libcutils libc
		LOCAL_MULTILIB := 32

		LOCAL_C_INCLUDES+= . \
		$(LOCAL_PATH)/include \

system/main/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -134,5 +134,6 @@ LOCAL_MODULE_RELATIVE_PATH := hw
		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)

system/stack/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -151,5 +151,6 @@ LOCAL_MODULE := libbt-brcm_stack
		LOCAL_MODULE_TAGS := optional
		LOCAL_MODULE_CLASS := STATIC_LIBRARIES
		LOCAL_SHARED_LIBRARIES := libcutils libc
		LOCAL_MULTILIB := 32

		include $(BUILD_STATIC_LIBRARY)

system/test/bluedroidtest/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,5 +38,7 @@ LOCAL_SHARED_LIBRARIES += libcutils \
		libhardware \
		libhardware_legacy

		LOCAL_MULTILIB := 32

		include $(BUILD_EXECUTABLE)