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

Commit c3fbae1c authored by Andre Eisenbach's avatar Andre Eisenbach
Browse files

Compile as 64-bit library; fix includes 

Change-Id: Ie5305d588ff54a80f06be786264e66042ddcf022
parent de4eb52c

system/bta/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ 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

+0 −2
Original line number Diff line number Diff line
@@ -163,8 +163,6 @@ LOCAL_REQUIRED_MODULES := \ 
    libbt-hci \

    libbt-vendor



LOCAL_MULTILIB := 32



LOCAL_CLANG_CFLAGS := -Wno-error=gnu-variable-sized-type-not-at-end

LOCAL_CLANG_CFLAGS += -Wno-typedef-redefinition

system/stack/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -162,7 +162,6 @@ LOCAL_MODULE_TAGS := optional 
LOCAL_MODULE_CLASS := STATIC_LIBRARIES

LOCAL_STATIC_LIBRARIES := libbt-hci

LOCAL_SHARED_LIBRARIES := libcutils libc

LOCAL_MULTILIB := 32

# gnu-variable-sized-type-not-at-end is needed for a variable-size header in

# a struct.

# const-logical-operand is needed for code in l2c_utils.c that looks intentional.

system/stack/btm/btm_inq.c

+3 −1
Original line number Diff line number Diff line
@@ -30,8 +30,10 @@ 
#include <stdio.h>

#include <stddef.h>



#include "bt_types.h"

#include "device/include/controller.h"

#include "osi/include/time.h"



#include "bt_types.h"

#include "bt_common.h"

#include "hcimsgs.h"

#include "btu.h"

system/stack/btm/btm_sec.c

+4 −2
Original line number Diff line number Diff line
@@ -27,14 +27,16 @@ 
#include <stdarg.h>

#include <string.h>



#include "device/include/controller.h"

#include "osi/include/log.h"

#include "osi/include/time.h"



#include "bt_types.h"

#include "bt_utils.h"

#include "btm_int.h"

#include "btu.h"

#include "device/include/controller.h"

#include "hcimsgs.h"

#include "l2c_int.h"

#include "osi/include/log.h"



#if (BT_USE_TRACES == TRUE && BT_TRACE_VERBOSE == FALSE)

/* needed for sprintf() */